no message

mall-server-api/src/main/java/com/gree/mall/manager/logic/material/manage/WebsitPartsChangeSalesLogic.java

@@ -92,7 +92,7 @@ public class WebsitPartsChangeSalesLogic {
 
         if (flag.equals(PartsOrderFlagEnum.AGREE.getKey())) {
             // 审核通过 师傅临占库存减 转销售库存加
-            List<WorkerStockDTO> workerStockDTOList = this.createWorkerStockDTO(partsChangeSales, partsChangeSalesItems, PartsRefTypeEnum.CHANGE_SALES.getKey(),
+            List<WorkerStockDTO> workerStockDTOList = this.createWorkerStockDTO(partsChangeSales, partsChangeSalesItems, PartsRefTypeEnum.CHANGE_SALES.getRemark(),
                     PartsAttrEnum.TEMP_NEW.getKey(), PartsAttrEnum.CHANGE_NEW.getKey());
             materialGoodsStockLogic.handleWorkerStock(workerStockDTOList);
         } else {
@@ -153,8 +153,8 @@ public class WebsitPartsChangeSalesLogic {
                 .insert();
 
         // 审核不通过延期 师傅临占库存减 新件库存加
-        List<WorkerStockDTO> workerStockDTOList = this.createWorkerStockDTO(partsChangeSales, partsChangeSalesItems, PartsRefTypeEnum.CHANGE_SALES.toString(),
-                PartsAttrEnum.TEMP_NEW.getKey(), PartsAttrEnum.NEW.getKey());
+        List<WorkerStockDTO> workerStockDTOList = this.createWorkerStockDTO(partsChangeSales, partsChangeSalesItems,
+                PartsRefTypeEnum.CHANGE_SALES.getRemark(), PartsAttrEnum.TEMP_NEW.getKey(), PartsAttrEnum.NEW.getKey());
         materialGoodsStockLogic.handleWorkerStock(workerStockDTOList);
     }
 
@@ -175,6 +175,7 @@ public class WebsitPartsChangeSalesLogic {
                 workerStockDTO.setWebsitName(partsChangeSales.getWebsitName());
                 workerStockDTO.setPartsWebsitId(partsChangeSales.getPartsWebsitId());
                 workerStockDTO.setSdate(DateUtil.date());
+                workerStockDTO.setGoodsType(WebsitGoodsTypeEnum.P.getKey());
                 workerStockDTO.setGoodsId(partsChangeSalesItem.getPartsNumber());
                 workerStockDTO.setGoodsName(partsChangeSalesItem.getPartsName());
                 workerStockDTO.setMaterialGroupName(partsChangeSalesItem.getMaterialGroupName());
@@ -204,6 +205,7 @@ public class WebsitPartsChangeSalesLogic {
                 workerStockDTO.setWebsitName(partsChangeSales.getWebsitName());
                 workerStockDTO.setPartsWebsitId(partsChangeSales.getPartsWebsitId());
                 workerStockDTO.setSdate(DateUtil.date());
+                workerStockDTO.setGoodsType(WebsitGoodsTypeEnum.P.getKey());
                 workerStockDTO.setGoodsId(partsChangeSalesItem.getPartsNumber());
                 workerStockDTO.setGoodsName(partsChangeSalesItem.getPartsName());
                 workerStockDTO.setMaterialGroupName(partsChangeSalesItem.getMaterialGroupName());

mall-server-api/src/main/java/com/gree/mall/manager/logic/material/manage/WebsitPartsSalesLogic.java

@@ -105,8 +105,8 @@ public class WebsitPartsSalesLogic {
         websitPartsChangeSalesItemService.saveBatch(partsChangeSalesItemList);
 
         // 师傅新件库存减 临占新件库存加
-        List<WorkerStockDTO> workerStockDTOList = this.createWorkerStockDTO(partsChangeSales, partsChangeSalesItemList, PartsRefTypeEnum.CHANGE_SALES.toString(),
-                PartsAttrEnum.NEW.getKey(), PartsAttrEnum.TEMP_NEW.getKey());
+        List<WorkerStockDTO> workerStockDTOList = this.createWorkerStockDTO(partsChangeSales, partsChangeSalesItemList,
+                PartsRefTypeEnum.CHANGE_SALES.getRemark(), PartsAttrEnum.NEW.getKey(), PartsAttrEnum.TEMP_NEW.getKey());
         materialGoodsStockLogic.handleWorkerStock(workerStockDTOList);
     }
 
@@ -127,6 +127,7 @@ public class WebsitPartsSalesLogic {
                 workerStockDTO.setWebsitName(partsChangeSales.getWebsitName());
                 workerStockDTO.setPartsWebsitId(partsChangeSales.getPartsWebsitId());
                 workerStockDTO.setSdate(DateUtil.date());
+                workerStockDTO.setGoodsType(WebsitGoodsTypeEnum.P.getKey());
                 workerStockDTO.setGoodsId(partsChangeSalesItem.getPartsNumber());
                 workerStockDTO.setGoodsName(partsChangeSalesItem.getPartsName());
                 workerStockDTO.setMaterialGroupName(partsChangeSalesItem.getMaterialGroupName());
@@ -156,6 +157,7 @@ public class WebsitPartsSalesLogic {
                 workerStockDTO.setWebsitName(partsChangeSales.getWebsitName());
                 workerStockDTO.setPartsWebsitId(partsChangeSales.getPartsWebsitId());
                 workerStockDTO.setSdate(DateUtil.date());
+                workerStockDTO.setGoodsType(WebsitGoodsTypeEnum.P.getKey());
                 workerStockDTO.setGoodsId(partsChangeSalesItem.getPartsNumber());
                 workerStockDTO.setGoodsName(partsChangeSalesItem.getPartsName());
                 workerStockDTO.setMaterialGroupName(partsChangeSalesItem.getMaterialGroupName());

mall-server-api/src/main/java/com/gree/mall/manager/logic/material/manage/WebsitPartsSalesOrderLogic.java

@@ -592,8 +592,8 @@ public class WebsitPartsSalesOrderLogic {
                 && BuyPeopleEnum.WORKER.getKey().equals(partsSalesOrderBean.getBuyPeople())) {
             // 如果是快递并且销售类型为“服务人员”的单，需要减师傅在途库存
             // 减师傅在途库存
-            List<WorkerStockDTO> workerStockDTOList = this.getWorkerStock(partsSalesOrderBean, PartsRefTypeEnum.SALES.getRemark(),
-                    PartsAttrEnum.WAY.getKey(), null);
+            List<WorkerStockDTO> workerStockDTOList = this.getWorkerStock(partsSalesOrderBean,
+                    PartsRefTypeEnum.SALES.getRemark(), PartsAttrEnum.WAY.getKey(), null);
             materialGoodsStockLogic.handleWorkerStock(workerStockDTOList);
         }
     }
@@ -867,11 +867,11 @@ public class WebsitPartsSalesOrderLogic {
                 workerStockDTO.setIdentity(item.getIdentity());
                 workerStockDTO.setWorkerId(partsSalesOrderBean.getWorkerId());
                 workerStockDTO.setWorkerName(partsSalesOrderBean.getWorkerName());
-                workerStockDTO.setGoodsType(WebsitGoodsTypeEnum.P.getKey());
                 workerStockDTO.setWebsitId(partsSalesOrderBean.getWebsitId());
                 workerStockDTO.setWebsitName(partsSalesOrderBean.getWebsitName());
                 workerStockDTO.setSdate(DateUtil.date());
                 workerStockDTO.setPartsWebsitId(item.getPartsWebsitId());
+                workerStockDTO.setGoodsType(WebsitGoodsTypeEnum.P.getKey());
                 workerStockDTO.setGoodsId(item.getPartsNumber());
                 workerStockDTO.setGoodsName(item.getPartsName());
                 workerStockDTO.setMaterialGroupName(item.getMaterialGroupName());

mall-server-api/src/main/java/com/gree/mall/manager/logic/material/worker/NewRefundManageLogic.java

@@ -209,7 +209,7 @@ public class NewRefundManageLogic {
                 workerStockDTO.setGoodsStockUnit(refundManageItem.getGoodsStockUnit());
                 workerStockDTO.setPrice(BigDecimal.ZERO);
                 workerStockDTO.setRef(partsNewRefundManage.getApplyNo());
-                workerStockDTO.setRefType(PartsRefTypeEnum.NEW_REFUND.getKey());
+                workerStockDTO.setRefType(PartsRefTypeEnum.NEW_REFUND.getRemark());
                 workerStockDTO.setPartsAttr(partsAttr1);
                 workerStockDTO.setChangeQty(refundManageItem.getQty());
                 workerStockDTO.setDirectFlag(DirectFlagEnum.SUB.getKey());
@@ -230,13 +230,14 @@ public class NewRefundManageLogic {
                 workerStockDTO.setWebsitName(partsNewRefundManage.getReceiveWebsitName());
                 workerStockDTO.setPartsWebsitId(partsNewRefundManage.getReceivePartsWebsitId());
                 workerStockDTO.setSdate(DateUtil.date());
+                workerStockDTO.setGoodsType(WebsitGoodsTypeEnum.P.getKey());
                 workerStockDTO.setGoodsId(refundManageItem.getPartsNumber());
                 workerStockDTO.setGoodsName(refundManageItem.getPartsName());
                 workerStockDTO.setMaterialGroupName(refundManageItem.getMaterialGroupName());
                 workerStockDTO.setGoodsStockUnit(refundManageItem.getGoodsStockUnit());
                 workerStockDTO.setPrice(BigDecimal.ZERO);
                 workerStockDTO.setRef(partsNewRefundManage.getApplyNo());
-                workerStockDTO.setRefType(PartsRefTypeEnum.NEW_REFUND.getKey());
+                workerStockDTO.setRefType(PartsRefTypeEnum.NEW_REFUND.getRemark());
                 workerStockDTO.setPartsAttr(partsAttr2);
                 workerStockDTO.setChangeQty(refundManageItem.getQty());
                 workerStockDTO.setDirectFlag(DirectFlagEnum.ADD.getKey());

mall-server-api/src/main/java/com/gree/mall/manager/logic/material/worker/OldRefundManageInnerLogic.java

@@ -47,8 +47,8 @@ public class OldRefundManageInnerLogic {
                 .updateById();
 
         String refType = PartsRepairFlagEnum.INNER.getKey().equals(partsOldRefundManage.getRepairFlag()) ?
-                PartsRefTypeEnum.OLD_REFUND.getKey() :
-                PartsRefTypeEnum.OUTSIDE_TO_SALES.getKey();
+                PartsRefTypeEnum.OLD_REFUND.getRemark() :
+                PartsRefTypeEnum.OUTSIDE_TO_SALES.getRemark();
         // 提交状态时 旧件库存减 临占件库存加
         List<WebsitPartsOldRefundManageItem> partsOldRefundManageItems = websitPartsOldRefundManageItemService.lambdaQuery()
                 .eq(WebsitPartsOldRefundManageItem::getApplyNo, partsOldRefundManage.getApplyNo())
@@ -79,6 +79,7 @@ public class OldRefundManageInnerLogic {
                 workerStockDTO.setWebsitName(partsOldRefundManage.getReceiveWebsitName());
                 workerStockDTO.setPartsWebsitId(partsOldRefundManage.getReceivePartsWebsitId());
                 workerStockDTO.setSdate(DateUtil.date());
+                workerStockDTO.setGoodsType(WebsitGoodsTypeEnum.P.getKey());
                 workerStockDTO.setGoodsId(refundManageItem.getNewPartsNumber());
                 workerStockDTO.setGoodsName(refundManageItem.getNewPartsName());
                 workerStockDTO.setMaterialGroupName(refundManageItem.getNewMaterialGroupName());
@@ -108,6 +109,7 @@ public class OldRefundManageInnerLogic {
                 workerStockDTO.setWebsitName(partsOldRefundManage.getReceiveWebsitName());
                 workerStockDTO.setPartsWebsitId(partsOldRefundManage.getReceivePartsWebsitId());
                 workerStockDTO.setSdate(DateUtil.date());
+                workerStockDTO.setGoodsType(WebsitGoodsTypeEnum.P.getKey());
                 workerStockDTO.setGoodsId(refundManageItem.getNewPartsNumber());
                 workerStockDTO.setGoodsName(refundManageItem.getNewPartsName());
                 workerStockDTO.setMaterialGroupName(refundManageItem.getNewMaterialGroupName());