修改字段

modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesPartTypeDefectService.java

@@ -1,4 +1,4 @@
-package cn.estsh.i3plus.ext.mes.api.base;
+package cn.estsh.i3plus.ext.mes.api.base;
 
 import cn.estsh.i3plus.pojo.mes.bean.MesPartTypeDefect;
 

modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesPartTypePictureService.java

@@ -1,4 +1,4 @@
-package cn.estsh.i3plus.ext.mes.api.base;
+package cn.estsh.i3plus.ext.mes.api.base;
 
 import cn.estsh.i3plus.pojo.mes.bean.MesPartTypePicture;
 

modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesShippingOrderManagementService.java

@@ -1,6 +1,8 @@
 package cn.estsh.i3plus.ext.mes.api.base;
 
 import cn.estsh.i3plus.pojo.mes.bean.MesShippingOrderManagement;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 
 /**
  * @Description:
@@ -9,5 +11,8 @@ import cn.estsh.i3plus.pojo.mes.bean.MesShippingOrderManagement;
  */
 public interface IMesShippingOrderManagementService extends IBaseMesService<MesShippingOrderManagement> {
 
+    @ApiOperation(value = "发运", notes = "发运")
+    public void saveShipping(MesShippingOrderManagement shippingOrderManagement);
+
 
 }

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesPartTypeDefectController.java

@@ -1,4 +1,4 @@
-package cn.estsh.i3plus.ext.mes.apiservice.controller.base;
+package cn.estsh.i3plus.ext.mes.apiservice.controller.base;
 
 import cn.estsh.i3plus.ext.mes.pojo.constant.MesCommonConstant;
 import cn.estsh.i3plus.pojo.mes.bean.MesPartTypeDefect;
@@ -6,11 +6,8 @@ import io.swagger.annotations.Api;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-/**
- * 零件类型缺陷类型对应关系
- */
 @Api("零件类型缺陷类型对应关系")
 @RestController
 @RequestMapping(MesCommonConstant.MES_YANFEN + "/mesPartTypeDefect")
 public class MesPartTypeDefectController extends BaseMesController<MesPartTypeDefect> {
-}
+}

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesShippingOrderManagementController.java

@@ -1,9 +1,19 @@
 package cn.estsh.i3plus.ext.mes.apiservice.controller.base;
 
+import cn.estsh.i3plus.ext.mes.api.base.IMesShippingOrderManagementService;
+import cn.estsh.i3plus.ext.mes.apiservice.config.AuthUtilExt;
 import cn.estsh.i3plus.ext.mes.pojo.constant.MesCommonConstant;
-import cn.estsh.i3plus.pojo.mes.bean.MesEquipmentCheckDetail;
+import cn.estsh.i3plus.platform.common.convert.ConvertBean;
+import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;
 import cn.estsh.i3plus.pojo.mes.bean.MesShippingOrderManagement;
+import cn.estsh.impp.framework.boot.auth.AuthUtil;
+import cn.estsh.impp.framework.boot.exception.ImppBusiException;
+import cn.estsh.impp.framework.boot.util.ResultBean;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -14,4 +24,29 @@ import org.springframework.web.bind.annotation.RestController;
 public class MesShippingOrderManagementController extends BaseMesController<MesShippingOrderManagement> {
 
 
+    @Autowired
+    private IMesShippingOrderManagementService shippingOrderManagementService;
+
+    @PostMapping(value = "/shipping")
+    @ApiOperation(value = "发运")
+    public ResultBean<MesShippingOrderManagement> saveShipping(@RequestBody MesShippingOrderManagement bean) {
+        try {
+//            validateInsert(bean);
+            //新增初始化
+            bean.setOrganizeCode("2031");
+//            bean.setOrganizeCode(AuthUtilExt.getOrganizeCode());
+//            ConvertBean.serviceModelInitialize(bean, AuthUtil.getSessionUser().getUserName());
+//            T t = (T) getBaseService().insert(bean);
+            shippingOrderManagementService.saveShipping(bean);
+//            afterInsert(t);
+            return ResultBean.success("操作成功")
+                    .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode())
+                    .setResultObject(bean);
+        } catch (ImppBusiException e) {
+            return ResultBean.fail(e).build();
+        } catch (Exception e) {
+            return ResultBean.fail(e);
+        }
+    }
+
 }

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesDefectAlarmConfigService.java

@@ -27,7 +27,7 @@ public class MesDefectAlarmConfigService extends BaseMesService<MesDefectAlarmCo
     protected void setPackQueryBean(MesDefectAlarmConfig bean, DdlPackBean packBean) {
         DdlPreparedPack.getStringEqualPack(bean.getDefectCode(), "defectCode", packBean);
         DdlPreparedPack.getNumEqualPack(bean.getTotalTriggerCount(), "totalTriggerCount", packBean);
-        DdlPreparedPack.getStringLikerPack(bean.getDefectLocation(), "defectLocation", packBean);
+        DdlPreparedPack.getStringLikerPack(bean.getDefectLocationCode(), "defectLocationCode", packBean);
         DdlPreparedPack.getStringEqualPack(bean.getPartTypeCode(), "partTypeCode", packBean);
     }
 

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesPartTypeDefectService.java

@@ -1,18 +1,12 @@
-package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base;
+package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base;
 
-import cn.estsh.i3plus.ext.mes.api.base.IMesPartTypeDefectService;
+import cn.estsh.i3plus.ext.mes.api.base.IBaseMesService;
 import cn.estsh.i3plus.pojo.mes.bean.MesPartTypeDefect;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
 @Service
 @Slf4j
-public class MesPartTypeDefectService extends BaseMesService<MesPartTypeDefect> implements IMesPartTypeDefectService {
+public class MesPartTypeDefectService extends BaseMesService<MesPartTypeDefect> implements IBaseMesService<MesPartTypeDefect> {
-
-//    protected void setPackQueryBean(MesDefect bean, DdlPackBean packBean) {
-//        DdlPreparedPack.getStringLikerPack(bean.getDefectCode(), "defectCode", packBean);
-//        DdlPreparedPack.getStringLikerPack(bean.getDefectName(), "defectName", packBean);
-//        DdlPreparedPack.getNumEqualPack(bean.getCategory(), "category", packBean);
-//    }
 
 }

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesPartTypePictureService.java

@@ -1,18 +1,13 @@
-package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base;
+package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base;
 
-import cn.estsh.i3plus.ext.mes.api.base.IMesPartTypePictureService;
+import cn.estsh.i3plus.ext.mes.api.base.IBaseMesService;
 import cn.estsh.i3plus.pojo.mes.bean.MesPartTypePicture;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
 @Service
 @Slf4j
-public class MesPartTypePictureService extends BaseMesService<MesPartTypePicture> implements IMesPartTypePictureService {
+public class MesPartTypePictureService extends BaseMesService<MesPartTypePicture> implements IBaseMesService<MesPartTypePicture> {
 
-//    protected void setPackQueryBean(MesDefect bean, DdlPackBean packBean) {
-//        DdlPreparedPack.getStringLikerPack(bean.getDefectCode(), "defectCode", packBean);
-//        DdlPreparedPack.getStringLikerPack(bean.getDefectName(), "defectName", packBean);
-//        DdlPreparedPack.getNumEqualPack(bean.getCategory(), "category", packBean);
-//    }
 
-}
+}

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesShippingOrderManagementService.java

@@ -4,13 +4,12 @@ import cn.estsh.i3plus.ext.mes.api.base.IMesShippingOrderManagementService;
 import cn.estsh.i3plus.ext.mes.pojo.util.MesExtEnumUtil;
 import cn.estsh.i3plus.platform.common.convert.ConvertBean;
 import cn.estsh.i3plus.platform.common.exception.ImppExceptionEnum;
+import cn.estsh.i3plus.platform.common.tool.TimeTool;
 import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
-import cn.estsh.i3plus.pojo.mes.bean.MesPartShippingGroup;
+import cn.estsh.i3plus.pojo.mes.bean.*;
-import cn.estsh.i3plus.pojo.mes.bean.MesPartShippingGroupDetail;
+import cn.estsh.i3plus.pojo.mes.repository.MesJisShippingRepository;
-import cn.estsh.i3plus.pojo.mes.bean.MesShippingOrderManagement;
-import cn.estsh.i3plus.pojo.mes.bean.MesShippingOrderManagementDetail;
 import cn.estsh.i3plus.pojo.mes.repository.MesPartShippingGroupRepository;
 import cn.estsh.impp.framework.boot.auth.AuthUtil;
 import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
@@ -38,11 +37,14 @@ public class MesShippingOrderManagementService extends BaseMesService<MesShippin
     @Autowired
     private MesPartShippingGroupRepository partShippingGroupRepository;
 
+    @Autowired
+    private MesJisShippingRepository jisShippingRepository;
+
 
     protected void setPackQueryBean(MesShippingOrderManagement bean, DdlPackBean packBean) {
         DdlPreparedPack.getStringEqualPack(bean.getShippingGroupNo(), "shippingGroupNo", packBean);
-        DdlPreparedPack.getStringEqualPack(bean.getCustomerCode(), "customerCode", packBean);
+        DdlPreparedPack.getStringEqualPack(bean.getCustCode(), "custCode", packBean);
-        DdlPreparedPack.getStringEqualPack(bean.getCustomerOrganizeCode(), "customerOrganizeCode", packBean);
+        DdlPreparedPack.getStringEqualPack(bean.getCustPlantCode(), "custPlantCode", packBean);
         DdlPreparedPack.getStringEqualPack(bean.getShippingGroupNo(), "shippingGroupNo", packBean);
         if (!StringUtils.isEmpty(bean.getReleaseTimeStart()) || !StringUtils.isEmpty(bean.getReleaseTimeEnd())) {
             DdlPreparedPack.timeBuilder(bean.getReleaseTimeStart(), bean.getReleaseTimeEnd(), "releaseTime", packBean, false);
@@ -211,8 +213,8 @@ public class MesShippingOrderManagementService extends BaseMesService<MesShippin
         // 数据校验
         ValidatorBean.checkNotNull(item.getShippingOrderNo(), "发运单不能为空");
         ValidatorBean.checkNotNull(item.getSeq(), "顺序号不能为空");
-        ValidatorBean.checkNotNull(item.getCustomerCode(), "客户代码不能为空");
+        ValidatorBean.checkNotNull(item.getCustCode(), "客户代码不能为空");
-        ValidatorBean.checkNotNull(item.getCustomerOrganizeCode(), "客户工厂代码不能为空");
+        ValidatorBean.checkNotNull(item.getCustPlantCode(), "客户工厂代码不能为空");
         ValidatorBean.checkNotNull(item.getShippingGroupNo(), "发运组代码不能为空");
         ValidatorBean.checkNotNull(item.getStatus(), "状态不能为空");
 
@@ -235,11 +237,40 @@ public class MesShippingOrderManagementService extends BaseMesService<MesShippin
         // 数据校验
         ValidatorBean.checkNotNull(item.getShippingOrderNo(), "发运单不能为空");
         ValidatorBean.checkNotNull(item.getSeq(), "顺序号不能为空");
-        ValidatorBean.checkNotNull(item.getCustomerCode(), "客户代码不能为空");
+        ValidatorBean.checkNotNull(item.getCustCode(), "客户代码不能为空");
-        ValidatorBean.checkNotNull(item.getCustomerOrganizeCode(), "客户工厂代码不能为空");
+        ValidatorBean.checkNotNull(item.getCustPlantCode(), "客户工厂代码不能为空");
         ValidatorBean.checkNotNull(item.getShippingGroupNo(), "发运组代码不能为空");
         ValidatorBean.checkNotNull(item.getStatus(), "状态不能为空");
     }
 
 
+    @Override
+    public void saveShipping(MesShippingOrderManagement bean) {
+
+        MesShippingOrderManagement originBean = baseRDao.getById(bean.getId());
+
+        DdlPackBean detailPackBean = DdlPackBean.getDdlPackBean(bean.getOrganizeCode());
+        DdlPreparedPack.getStringEqualPack(originBean.getShippingOrderNo(), "shippingOrderNo", detailPackBean);
+        List<MesShippingOrderManagementDetail> detailDeleteList = detailService.findAll(detailPackBean);
+
+        List<MesJisShipping> jisShippingList = new ArrayList<>();
+        detailDeleteList.forEach(k -> {
+            MesJisShipping jisShipping = new MesJisShipping();
+            BeanUtils.copyProperties(originBean, jisShipping, "id");
+            BeanUtils.copyProperties(k, jisShipping, "id");
+            jisShipping.setFactoryCode(originBean.getCustPlantCode());
+            jisShipping.setShippingTime(TimeTool.getNowTime(true));
+            jisShipping.setDock(originBean.getSendDockCode());
+            jisShipping.setCusDock(originBean.getCustDockCode());
+            jisShipping.setCustOrderNo(k.getCustOrderNo());
+            jisShipping.setSerialNumber(k.getBarcode());
+            jisShipping.setQuantityPerCar(detailDeleteList.size());
+            jisShipping.setShippingOrderCode(originBean.getShippingOrderNo());
+            ConvertBean.serviceModelInitialize(jisShipping, AuthUtil.getSessionUser().getUserName());
+            jisShippingList.add(jisShipping);
+        });
+
+        jisShippingRepository.saveAll(jisShippingList);
+
+    }
 }