供应商

src/main/java/com/dk/mdm/mapper/ivt/InventoryMapper.xml

@@ -301,7 +301,7 @@
             <if test="nonStdCode != null and nonStdCode != ''">
                 AND tpi.non_std_code = #{nonStdCode}
             </if>
-            <if test="nonStdCode == null and nonStdCode == ''">
+            <if test="nonStdCode == null or nonStdCode == ''">
                 AND tpi.non_std_code = '-'
             </if>
         </where>

src/main/java/com/dk/mdm/service/sale/OrderService.java

@@ -490,9 +490,11 @@ public class OrderService extends BaseService<Order> {
             throw new BaseBusinessException(ResponseCodeEnum.OPERATE_FAIL.getCode(), ErrorCodeEnum.ISFLGVALID_FALSE.getMessage());
         }
         // 如果全部出库了
-        if (orderForUpdate.getSumQuantity().compareTo(orderForUpdate.getOutQty()) == 0) {
-            throw new BaseBusinessException(ResponseCodeEnum.OPERATE_FAIL.getCode(), ErrorCodeEnum.ORDER_IS_OUT.getMessage());
-        }
+        //标：之前沟通允许大编辑，目前订单开单已出库的单子进行编辑是不允许操作的（请确定一下，到底系统设计是否允许大编辑？）
+        //bug 6933可查
+//        if (orderForUpdate.getSumQuantity().compareTo(orderForUpdate.getOutQty()) == 0) {
+//            throw new BaseBusinessException(ResponseCodeEnum.OPERATE_FAIL.getCode(), ErrorCodeEnum.ORDER_IS_OUT.getMessage());
+//        }
 
         // 明细实体（避免并发，需要再查一遍）
         OrderItem orderItemForUpdate;