工艺，工艺工序关系基础信息维护

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

@@ -0,0 +1,15 @@
+package cn.estsh.i3plus.ext.mes.api.base;
+
+import cn.estsh.i3plus.pojo.mes.bean.MesCraft;
+
+/**
+ * @Description : 工艺信息
+ * @Reference :
+ * @Author : junsheng.li
+ * @CreateDate 2024/5/11 13:54
+ * @Modify:
+ **/
+public interface IMesCraftService extends IBaseMesService<MesCraft> {
+
+
+}

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

@@ -0,0 +1,15 @@
+package cn.estsh.i3plus.ext.mes.api.base;
+
+import cn.estsh.i3plus.pojo.mes.bean.MesProcessCraftCfg;
+
+/**
+ * @Description : 工序工艺关系
+ * @Reference :
+ * @Author : junsheng.li
+ * @CreateDate 2024/5/11 13:54
+ * @Modify:
+ **/
+public interface IMesProcessCraftCfgService extends IBaseMesService<MesProcessCraftCfg> {
+
+
+}

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

@@ -0,0 +1,20 @@
+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.MesCraft;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @Description : 工艺信息
+ * @Reference :
+ * @Author : junsheng.li
+ * @CreateDate 2024/5/11 13:52
+ * @Modify:
+ **/
+@Api("工艺信息")
+@RestController
+@RequestMapping(MesCommonConstant.MES_YANFEN + "/mesCraft")
+public class MesCraftController extends BaseMesController<MesCraft> {
+}

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

@@ -0,0 +1,20 @@
+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.MesProcessCraftCfg;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @Description : 工序工艺关系
+ * @Reference :
+ * @Author : junsheng.li
+ * @CreateDate 2024/5/11 13:52
+ * @Modify:
+ **/
+@Api("工序工艺关系")
+@RestController
+@RequestMapping(MesCommonConstant.MES_YANFEN + "/mesProcessCraftCfg")
+public class MesProcessCraftCfgController extends BaseMesController<MesProcessCraftCfg> {
+}

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/daoimpl/SapProductPlanDaoImpl.java

@@ -33,17 +33,17 @@ public class SapProductPlanDaoImpl implements ISapProductPlanDao {
     @Override
     public ListPager<SapProductPlan> querySapProductPlanPager(SapProductPlan sapProductPlan, Pager pager) {
         //查询数据
-        StringBuffer dataHql = new StringBuffer("select sap.plnum,sap.plmat,sap.gsmng," +
+        StringBuffer dataHql = new StringBuffer("select sap.plnum,sap.plmat,ifnull(sap.gsmng,0) as sumQty," +
-                "mes.complete_qty,sap.gsmng-mes.complete_qty as unFinishQty,sap.meins,sap.psttr,sap.pedtr,sap.l_str," +
+                "ifnull(mes.complete_qty,0) as completeQty,sap.meins,sap.psttr,sap.pedtr,sap.l_str," +
-                "sap.plwrk,mes.create_date_time,mes.create_user,mes.modify_date_time,mes.modify_user");
+                "sap.plwrk,sap.create_date_time,sap.create_user,sap.modify_date_time,sap.modify_user");
         StringBuilder hql = new StringBuilder();
         hql.append(" from sap_product_plan sap left join mes_work_order mes on sap.plnum = mes.plan_order_no and sap.plmat = mes.part_no " +
                 "where sap.is_deleted=:isDeleted and sap.is_valid=:isValid and sap.organize_code=:organizeCode " +
                 " and ((mes.is_deleted=:isDeleted and mes.is_valid=:isValid and mes.organize_code=:organizeCode) or mes.id is null)");
         //拼接查询条件
         packWhere(sapProductPlan, hql);
-        StringBuffer unionDataHql = new StringBuffer("select sap.plnum,mes.part_no,mes.qty," +
+        StringBuffer unionDataHql = new StringBuffer("select sap.plnum,mes.part_no,ifnull(mes.qty,0) as sumQty," +
-                "mes.complete_qty,mes.qty-mes.complete_qty as unFinishQty,sap.meins,sap.psttr,sap.pedtr,sap.l_str," +
+                "ifnull(mes.complete_qty,0) as completeQty,sap.meins,sap.psttr,sap.pedtr,sap.l_str," +
                 "sap.plwrk,mes.create_date_time,mes.create_user,mes.modify_date_time,mes.modify_user");
         StringBuilder unionHql = new StringBuilder();
         unionHql.append(" from sap_product_plan sap right join mes_work_order mes on sap.plnum = mes.plan_order_no and sap.plmat = mes.part_no " +
@@ -67,8 +67,8 @@ public class SapProductPlanDaoImpl implements ISapProductPlanDao {
         for (Object result : resultList) {
             Object[] cells = (Object[]) result;
             SapProductPlan tjMgnBoardModel = new SapProductPlan(String.valueOf(cells[0]), String.valueOf(cells[1]), Double.valueOf(String.valueOf(cells[2])),
-                    Double.valueOf(String.valueOf(cells[3])), Double.valueOf(String.valueOf(cells[4])), String.valueOf(cells[5]), String.valueOf(cells[6]), String.valueOf(cells[7]),
+                    Double.valueOf(String.valueOf(cells[3])),String.valueOf(cells[4]), String.valueOf(cells[5]), String.valueOf(cells[6]), String.valueOf(cells[7]),
-                    String.valueOf(cells[8]), String.valueOf(cells[9]), String.valueOf(cells[10]), String.valueOf(cells[11]), String.valueOf(cells[12]), String.valueOf(cells[13]));
+                    String.valueOf(cells[8]), String.valueOf(cells[9]), String.valueOf(cells[10]), String.valueOf(cells[11]), String.valueOf(cells[12]));
             list.add(tjMgnBoardModel);
         }
         return new ListPager<>(list, pager);

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

@@ -0,0 +1,67 @@
+package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base;
+
+import cn.estsh.i3plus.ext.mes.api.base.IMesCraftService;
+import cn.estsh.i3plus.ext.mes.api.base.IMesProcessCraftCfgService;
+import cn.estsh.i3plus.platform.common.exception.ImppExceptionEnum;
+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.MesCraft;
+import cn.estsh.i3plus.pojo.mes.bean.MesCustomerCarModel;
+import cn.estsh.i3plus.pojo.mes.bean.MesProcessCraftCfg;
+import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
+import cn.estsh.impp.framework.boot.util.ValidatorBean;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+/**
+ * @Description : 工艺信息
+ * @Reference :
+ * @Author : junsheng.li
+ * @CreateDate 2024/5/11 13:55
+ * @Modify:
+ **/
+@Service
+@Slf4j
+public class MesCraftServiceImpl extends BaseMesService<MesCraft> implements IMesCraftService {
+
+    protected void setPackQueryBean(MesCraft bean, DdlPackBean packBean) {
+        DdlPreparedPack.getStringEqualPack(bean.getCraftCode(), "craftCode", packBean);
+        DdlPreparedPack.getStringLikerPack(bean.getCraftName(), "craftName", packBean);
+    }
+
+    protected void onInsertBean(MesCraft item) {
+        // 数据校验
+        ValidatorBean.checkNotNull(item.getCraftCode(), "工艺代码不能为空");
+
+        DdlPackBean roadPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode());
+        DdlPreparedPack.getStringEqualPack(item.getCraftCode(), "craftCode", roadPackBean);
+
+        boolean flg = baseRDao.isExitByHql(roadPackBean);
+        if (flg) {
+            throw ImppExceptionBuilder.newInstance()
+                    .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode())
+                    .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
+                    .setErrorDetail("工艺代码【%s】已经存在，请检查数据", item.getCraftCode())
+                    .build();
+        }
+
+    }
+
+    protected void onUpdateBean(MesCraft item) {
+        // 数据校验
+        ValidatorBean.checkNotNull(item.getCraftCode(), "工艺代码不能为空");
+
+        DdlPackBean roadPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode());
+        DdlPreparedPack.getStringEqualPack(item.getCraftCode(), "craftCode", roadPackBean);
+        DdlPreparedPack.getNumNOEqualPack(item.getId(), "id", roadPackBean);
+        boolean flg = baseRDao.isExitByHql(roadPackBean);
+        if (flg) {
+            throw ImppExceptionBuilder.newInstance()
+                    .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode())
+                    .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
+                    .setErrorDetail("工艺代码【%s】已经存在，请检查数据", item.getCraftCode())
+                    .build();
+        }
+    }
+}

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

@@ -0,0 +1,67 @@
+package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base;
+
+import cn.estsh.i3plus.ext.mes.api.base.IMesProcessCraftCfgService;
+import cn.estsh.i3plus.platform.common.exception.ImppExceptionEnum;
+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.MesProcessCraftCfg;
+import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
+import cn.estsh.impp.framework.boot.util.ValidatorBean;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+/**
+ * @Description : 工序工艺关系
+ * @Reference :
+ * @Author : junsheng.li
+ * @CreateDate 2024/5/11 13:55
+ * @Modify:
+ **/
+@Service
+@Slf4j
+public class MesProcessCraftCfgServiceImpl extends BaseMesService<MesProcessCraftCfg> implements IMesProcessCraftCfgService {
+
+    protected void setPackQueryBean(MesProcessCraftCfg bean, DdlPackBean packBean) {
+        DdlPreparedPack.getStringEqualPack(bean.getCraftCode(), "craftCode", packBean);
+        DdlPreparedPack.getStringEqualPack(bean.getProcessCode(), "processCode", packBean);
+        DdlPreparedPack.getStringLikerPack(bean.getCraftName(), "craftName", packBean);
+        DdlPreparedPack.getStringLikerPack(bean.getProcessName(), "processName", packBean);
+    }
+
+    protected void onInsertBean(MesProcessCraftCfg item) {
+        // 数据校验
+        ValidatorBean.checkNotNull(item.getCraftCode(), "工艺代码不能为空");
+        ValidatorBean.checkNotNull(item.getProcessCode(), "工序代码不能为空");
+
+        DdlPackBean roadPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode());
+        DdlPreparedPack.getStringEqualPack(item.getProcessCode(), "processCode", roadPackBean);
+
+        boolean flg = baseRDao.isExitByHql(roadPackBean);
+        if (flg) {
+            throw ImppExceptionBuilder.newInstance()
+                    .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode())
+                    .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
+                    .setErrorDetail("工序代码【%s】已经存在，请检查数据", item.getCraftCode())
+                    .build();
+        }
+    }
+
+    protected void onUpdateBean(MesProcessCraftCfg item) {
+        // 数据校验
+        ValidatorBean.checkNotNull(item.getCraftCode(), "工艺代码不能为空");
+        ValidatorBean.checkNotNull(item.getProcessCode(), "工序代码不能为空");
+
+        DdlPackBean roadPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode());
+        DdlPreparedPack.getStringEqualPack(item.getProcessCode(), "processCode", roadPackBean);
+        DdlPreparedPack.getNumNOEqualPack(item.getId(), "id", roadPackBean);
+        boolean flg = baseRDao.isExitByHql(roadPackBean);
+        if (flg) {
+            throw ImppExceptionBuilder.newInstance()
+                    .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode())
+                    .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
+                    .setErrorDetail("工序代码【%s】已经存在，请检查数据", item.getCraftCode())
+                    .build();
+        }
+    }
+}