FengChaoYu il y a 8 mois
Parent
commit
2224825965

+ 5 - 0
mall-server-api/src/main/java/com/gree/mall/manager/logic/material/base/WebsitGoodsLogic.java

@@ -135,6 +135,11 @@ public class WebsitGoodsLogic {
                 && StringUtils.isBlank(bean.getPartType())) {
             throw new RemoteServiceException("配件类型不能为空");
         }
+        if (bean.getGoodsType().equals(WebsitGoodsTypeEnum.P.getKey())
+                && bean.getNormType().equals(NormTypeEnum.M.getKey())
+                && StringUtils.isBlank(bean.getMaterialGroupName())) {
+            throw new RemoteServiceException("物料组不能为空");
+        }
 
         bean.setGoodsId(null);
         if (Objects.nonNull(adminUser.getAdminCompanyWechat())) {

+ 3 - 1
mall-server-api/src/main/java/com/gree/mall/manager/logic/material/manage/WebsitPartsOldOutLogic.java

@@ -266,7 +266,9 @@ public class WebsitPartsOldOutLogic {
                     .setRepairCustomNo(repairCustomNo)
                     .setImportDate(curDate)
                     .setStorageId(storage.getStorageId())
-                    .setStorageName(storage.getStorageName());
+                    .setStorageName(storage.getStorageName())
+                    .setCreateBy(adminUser.getNickName())
+                    .setCreateTime(curDate);
             partsShopOldOutRecordDTO.setAdminWebsit(sendShop);
             oldOutRecordDTOS.add(partsShopOldOutRecordDTO);
         }