koushanshan 1 год назад
Родитель
Сommit
1eaa7e9b28

+ 7 - 5
src/main/java/com/dk/mdm/service/ivt/inbound/InboundPurchaseReturnService.java

@@ -252,11 +252,13 @@ public class InboundPurchaseReturnService extends BaseService<Inbound> {
             for (InboundItemVO inboundItemVO : inboundVO.getItemList()) {
                 InboundItem inboundItem = new InboundItem();
                 inboundItem.setItemId(inboundItemVO.getItemId());
-                inboundItem.setRemarks(inboundItemVO.getRemarks());
-                inboundItemMapper.update(inboundItem,
-                        new UpdateWrapper<InboundItem>().lambda()
-                                .eq(InboundItem::getItemId, UUID.fromString(inboundItem.getItemId()))
-                );
+                if (inboundItemVO.getRemarks() != null || inboundItemVO.getRemarks() != " ") {
+                    inboundItem.setRemarks(inboundItemVO.getRemarks());
+                    inboundItemMapper.update(inboundItem,
+                            new UpdateWrapper<InboundItem>().lambda()
+                                    .eq(InboundItem::getItemId, UUID.fromString(inboundItem.getItemId()))
+                    );
+                }
             }
         }
         //endregion

+ 7 - 5
src/main/java/com/dk/mdm/service/ivt/inbound/InboundPurchaseService.java

@@ -319,11 +319,13 @@ public class InboundPurchaseService extends BaseService<Inbound> {
             for (InboundItemVO inboundItemVO : inboundVO.getItemList()) {
                 InboundItem inboundItem = new InboundItem();
                 inboundItem.setItemId(inboundItemVO.getItemId());
-                inboundItem.setRemarks(inboundItemVO.getRemarks());
-                inboundItemMapper.update(inboundItem,
-                        new UpdateWrapper<InboundItem>().lambda()
-                                .eq(InboundItem::getItemId, UUID.fromString(inboundItem.getItemId()))
-                );
+                if (inboundItemVO.getRemarks() != null || inboundItemVO.getRemarks() != " ") {
+                    inboundItem.setRemarks(inboundItemVO.getRemarks());
+                    inboundItemMapper.update(inboundItem,
+                            new UpdateWrapper<InboundItem>().lambda()
+                                    .eq(InboundItem::getItemId, UUID.fromString(inboundItem.getItemId()))
+                    );
+                }
             }
         }
         //endregion

+ 7 - 5
src/main/java/com/dk/mdm/service/ivt/outbound/OutboundSaleOrderService.java

@@ -311,11 +311,13 @@ public class OutboundSaleOrderService extends BaseService<Outbound> {
             for (OutboundItemVO outboundItemVO : outboundVO.getItemList()) {
                 OutboundItem outboundItem = new OutboundItem();
                 outboundItem.setItemId(outboundItemVO.getItemId());
-                outboundItem.setRemarks(outboundItemVO.getRemarks());
-                outboundItemMapper.update(outboundItem,
-                        new UpdateWrapper<OutboundItem>().lambda()
-                                .eq(OutboundItem::getItemId, UUID.fromString(outboundItem.getItemId()))
-                );
+                if(outboundItemVO.getRemarks() != null || outboundItemVO.getRemarks()!=" "){
+                    outboundItem.setRemarks(outboundItemVO.getRemarks());
+                    outboundItemMapper.update(outboundItem,
+                            new UpdateWrapper<OutboundItem>().lambda()
+                                    .eq(OutboundItem::getItemId, UUID.fromString(outboundItem.getItemId()))
+                    );
+                }
             }
         }
         //endregion

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

@@ -443,11 +443,13 @@ public class OutboundSaleReturnService extends BaseService<Outbound> {
             for (OutboundItemVO outboundItemVO : outboundVO.getItemList()) {
                 OutboundItem outboundItem = new OutboundItem();
                 outboundItem.setItemId(outboundItemVO.getItemId());
-                outboundItem.setRemarks(outboundItemVO.getRemarks());
-                outboundItemMapper.update(outboundItem,
-                        new UpdateWrapper<OutboundItem>().lambda()
-                                .eq(OutboundItem::getItemId, UUID.fromString(outboundItem.getItemId()))
-                );
+                if (outboundItemVO.getRemarks() != null || outboundItemVO.getRemarks() != " ") {
+                    outboundItem.setRemarks(outboundItemVO.getRemarks());
+                    outboundItemMapper.update(outboundItem,
+                            new UpdateWrapper<OutboundItem>().lambda()
+                                    .eq(OutboundItem::getItemId, UUID.fromString(outboundItem.getItemId()))
+                    );
+                }
             }
         }
         //endregion
@@ -602,8 +604,7 @@ public class OutboundSaleReturnService extends BaseService<Outbound> {
                 invMap.put("delOutDetail", outboundVO.getDeleteItemList());
                 inventoryService.operatingInventoryInformation(invMap);
                 //endregion
-            }
-            else{
+            } else {
                 throw new BaseBusinessException(ResponseCodeEnum.OPERATE_FAIL.getCode(), ErrorCodeEnum.FLG_HANDLE_SETTING_NOT_ENABLED_OUT.getMessage());
             }
             //endregion
@@ -701,8 +702,7 @@ public class OutboundSaleReturnService extends BaseService<Outbound> {
                 //region  反写出库总单 反写订单总单
                 this.updatePrimaryTotal(outboundVO, true);
                 //endregion
-            }
-            else{
+            } else {
                 throw new BaseBusinessException(ResponseCodeEnum.OPERATE_FAIL.getCode(), ErrorCodeEnum.FLG_HANDLE_SETTING_NOT_ENABLED_OUT.getMessage());
             }
             //endregion