Merge branch 'master' of http://git.dongkesoft.com:9001/iBOSS-2.0-Mini/iboss-server-mdm

src/main/java/com/dk/mdm/mapper/mst/CustomerMapper.xml

@@ -112,10 +112,10 @@
                 AND tmc.cus_code = #{cusCode}
             </if>
             <if test="cusName != null and cusName != ''">
-                AND tmc.cus_name = #{cusName}
+                AND tmc.cus_name like concat('%', my_ex.likequery(#{cusName}) , '%')
             </if>
             <if test="cusPhone != null and cusPhone != ''">
-                AND tmc.cus_phone = #{cusPhone}
+                AND tmc.cus_phone like concat('%', my_ex.likequery(#{cusPhone}) , '%')
             </if>
             <if test="addressArea != null and addressArea != ''">
                 AND tmc.address_area = #{addressArea}
@@ -133,10 +133,10 @@
                 AND tmc.address_full = #{addressFull}
             </if>
             <if test="contactName != null and contactName != ''">
-                AND tmc.contact_name = #{contactName}
+                AND tmc.contact_name like concat('%', my_ex.likequery(#{contactName}) , '%')
             </if>
             <if test="contactPhone != null and contactPhone != ''">
-                AND tmc.contact_phone = #{contactPhone}
+                AND tmc.contact_phone like concat('%', my_ex.likequery(#{contactPhone}) , '%')
             </if>
             <if test="cusFrom != null and cusFrom != ''">
                 AND tmc.cus_from = #{cusFrom}::uuid

src/main/java/com/dk/mdm/service/ivt/inbound/InboundOtherService.java

@@ -589,8 +589,10 @@ public class InboundOtherService extends BaseService<Inbound> {
                 inboundItemVO.setInventoryType(Constant.InventoryType.INBOUND.getName());
                 inboundItemVO.setInventoryDocCode(Constant.InventoryDocCode.OTHER_INBOUND.getValue());
                 //编辑之前的数
-                inboundItemVO.setQtyBeforeUpdate(inboundItemResponse.getIntoQty());
-                inboundItemVO.setAmtBeforeUpdate(inboundItemResponse.getIntoAmt());
+                if (inboundItemResponse.getIntoQty().compareTo(BigDecimal.ZERO) > 0) {
+                    inboundItemVO.setQtyBeforeUpdate(inboundItemResponse.getIntoQty());
+                    inboundItemVO.setAmtBeforeUpdate(inboundItemResponse.getIntoAmt());
+                }
                 inboundItemVO.setAddOrEditFlag(true);
                 //endregion
             }

src/main/java/com/dk/mdm/service/ivt/inbound/InboundPurchaseReturnService.java

@@ -652,8 +652,10 @@ public class InboundPurchaseReturnService extends BaseService<Inbound> {
                 inboundItemVO.setInventoryType(Constant.InventoryType.INBOUND.getName());
                 inboundItemVO.setInventoryDocCode(Constant.InventoryDocCode.PURCHASE_RETURN.getValue());
                 //编辑之前的数
-                inboundItemVO.setQtyBeforeUpdate(inboundItemResponse.getIntoQty());
-                inboundItemVO.setAmtBeforeUpdate(inboundItemResponse.getIntoAmt());
+                if(inboundItemResponse.getIntoQty().compareTo(BigDecimal.ZERO)>0){
+                    inboundItemVO.setQtyBeforeUpdate(inboundItemResponse.getIntoQty());
+                    inboundItemVO.setAmtBeforeUpdate(inboundItemResponse.getIntoAmt());
+                }
                 inboundItemVO.setAddOrEditFlag(true);
                 //endregion
             }

src/main/java/com/dk/mdm/service/ivt/inbound/InboundPurchaseService.java

@@ -944,8 +944,10 @@ public class InboundPurchaseService extends BaseService<Inbound> {
                 inboundItemVO.setInventoryType(Constant.InventoryType.INBOUND.getName());
                 inboundItemVO.setInventoryDocCode(Constant.InventoryDocCode.PURCHASE_ORDER.getValue());
                 //编辑之前的数
-                inboundItemVO.setQtyBeforeUpdate(inboundItemResponse.getIntoQty());
-                inboundItemVO.setAmtBeforeUpdate(inboundItemResponse.getIntoAmt());
+                if(inboundItemResponse.getIntoQty().compareTo(BigDecimal.ZERO)>0) {
+                    inboundItemVO.setQtyBeforeUpdate(inboundItemResponse.getIntoQty());
+                    inboundItemVO.setAmtBeforeUpdate(inboundItemResponse.getIntoAmt());
+                }
                 inboundItemVO.setAddOrEditFlag(true);
                 //endregion
             }

src/main/java/com/dk/mdm/service/ivt/outbound/OutboundOtherService.java

@@ -593,8 +593,10 @@ public class OutboundOtherService extends BaseService<Outbound> {
                 outboundItemVO.setInventoryType(Constant.InventoryType.OUTBOUND.getName());
                 outboundItemVO.setInventoryDocCode(Constant.InventoryDocCode.OTHER_OUTBOUND.getValue());
                 //编辑之前的数
-                outboundItemVO.setQtyBeforeUpdate(outboundItemResponse.getOutQty());
-                outboundItemVO.setAmtBeforeUpdate(outboundItemResponse.getOutAmt());
+                if(outboundItemResponse.getOutQty().compareTo(BigDecimal.ZERO)>0) {
+                    outboundItemVO.setQtyBeforeUpdate(outboundItemResponse.getOutQty());
+                    outboundItemVO.setAmtBeforeUpdate(outboundItemResponse.getOutAmt());
+                }
                 outboundItemVO.setAddOrEditFlag(true);
                 //endregion
             }

src/main/java/com/dk/mdm/service/ivt/outbound/OutboundSaleOrderService.java

@@ -940,8 +940,10 @@ public class OutboundSaleOrderService extends BaseService<Outbound> {
                 outboundItemVO.setInventoryType(Constant.InventoryType.OUTBOUND.getName());
                 outboundItemVO.setInventoryDocCode(Constant.InventoryDocCode.SALE_ORDER.getValue());
                 //编辑之前的数
-                outboundItemVO.setQtyBeforeUpdate(outboundItemResponse.getOutQty());
-                outboundItemVO.setAmtBeforeUpdate(outboundItemResponse.getOutAmt());
+                if (outboundItemResponse.getOutQty().compareTo(BigDecimal.ZERO) > 0) {
+                    outboundItemVO.setQtyBeforeUpdate(outboundItemResponse.getOutQty());
+                    outboundItemVO.setAmtBeforeUpdate(outboundItemResponse.getOutAmt());
+                }
                 outboundItemVO.setAddOrEditFlag(true);
                 //endregion
 

src/main/java/com/dk/mdm/service/ivt/outbound/OutboundSaleReturnService.java

@@ -901,8 +901,10 @@ public class OutboundSaleReturnService extends BaseService<Outbound> {
                 outboundItemVO.setInventoryType(Constant.InventoryType.OUTBOUND.getName());
                 outboundItemVO.setInventoryDocCode(Constant.InventoryDocCode.SALE_RETURN.getValue());
                 //编辑之前的数
-                outboundItemVO.setQtyBeforeUpdate(outboundItemResponse.getOutQty());
-                outboundItemVO.setAmtBeforeUpdate(outboundItemResponse.getOutAmt());
+                if (outboundItemResponse.getOutQty().compareTo(BigDecimal.ZERO) > 0) {
+                    outboundItemVO.setQtyBeforeUpdate(outboundItemResponse.getOutQty());
+                    outboundItemVO.setAmtBeforeUpdate(outboundItemResponse.getOutAmt());
+                }
                 outboundItemVO.setAddOrEditFlag(true);
                 //endregion
             }