Merge remote-tracking branch 'origin/dev' into dev

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

@@ -2,6 +2,8 @@ package cn.estsh.i3plus.ext.mes.api.base;
 
 import cn.estsh.i3plus.pojo.mes.bean.MesCustomerMessagePoint;
 
+import java.util.List;
+
 /**
  * @Description:
  * @CreateDate 2024/04/16
@@ -10,4 +12,11 @@ import cn.estsh.i3plus.pojo.mes.bean.MesCustomerMessagePoint;
 public interface IMesCustomerMessagePointService extends IBaseMesService<MesCustomerMessagePoint> {
 
         MesCustomerMessagePoint getPointByCode(String pointCode,String organizeCode);
+
+        /**
+         * 根据客户工厂代码查找对应的
+         * @param custOrganizeCode
+         * @return
+         */
+        List<MesCustomerMessagePoint> getByCustOrganizeCode(String custOrganizeCode);
 }

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

@@ -1,15 +1,37 @@
 package cn.estsh.i3plus.ext.mes.apiservice.controller.base;
 
+import cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base.MesCustomerMessagePointService;
 import cn.estsh.i3plus.ext.mes.pojo.constant.MesCommonConstant;
 import cn.estsh.i3plus.pojo.mes.bean.MesCustomerMessagePoint;
 import cn.estsh.i3plus.pojo.mes.bean.MesWorkCenter;
+import cn.estsh.impp.framework.boot.util.ResultBean;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * 客户信息点
  */
 @RestController
 @RequestMapping(MesCommonConstant.MES_YANFEN + "/mesCustomerMessagePoint")
 public class MesCustomerMessagePointController extends BaseMesController<MesCustomerMessagePoint>{
+
+    @Autowired
+    private MesCustomerMessagePointService mesCustomerMessagePointService;
+    //根据客户工厂查找对应的信息点信息
+    @GetMapping("/list/{custOrganizeCode}")
+    @ApiOperation(value = "查询当前客户工厂的信息点", notes = "查询当前客户工厂的信息点")
+    public ResultBean list(@PathVariable("custOrganizeCode") String custOrganizeCode){
+        try {
+            List<MesCustomerMessagePoint> messagePoints = mesCustomerMessagePointService.getByCustOrganizeCode(custOrganizeCode);
+            return ResultBean.success("查询成功").setResultList(messagePoints);
+        } catch (Exception e) {
+            return ResultBean.fail("查询失败").setErrorMsg(e.getMessage());
+        }
+    }
 }

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

@@ -6,12 +6,12 @@ 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.MesCustomerMessagePoint;
+import cn.estsh.impp.framework.boot.auth.AuthUtil;
 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;
 
-import java.util.ArrayList;
 import java.util.List;
 
 @Service
@@ -65,4 +65,11 @@ public class MesCustomerMessagePointService extends BaseMesService<MesCustomerMe
         List<MesCustomerMessagePoint> messagePoints = baseRDao.findByHqlWhere(ddlPackBean);
         return messagePoints.isEmpty() ? null: messagePoints.get(0);
     }
+
+    @Override
+    public List<MesCustomerMessagePoint> getByCustOrganizeCode(String custOrganizeCode) {
+        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(AuthUtil.getOrganizeCode());
+        DdlPreparedPack.getStringEqualPack(custOrganizeCode, "custOrganizeCode", ddlPackBean);
+        return baseRDao.findByHqlWhere(ddlPackBean);
+    }
 }

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/MesCreateWorkOrderImpl.java

@@ -17,6 +17,7 @@ import cn.estsh.i3plus.pojo.mes.repository.*;
 import cn.estsh.i3plus.pojo.mes.util.MesExtEnumUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
+import org.apache.logging.log4j.util.Strings;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
@@ -270,7 +271,12 @@ public class MesCreateWorkOrderImpl implements IMesCreateWorkOrder {
         Calendar custCalendar = Calendar.getInstance();
         custCalendar.setTime(new Date());
         GenSerialNoModel custGenSerialNoModel = new GenSerialNoModel("WH_CUST_SN_RULE");
-        String partNo = mesWorkOrder.getCustPartNo();
+//        String partNo = mesWorkOrder.getCustPartNo();
+        /**
+         * 2024/11/20
+         * 客户零件号需要从零件生产组中获取
+         */
+        String partNo = mesPartProdGroupDetail.getCustPartNo();
         String prefix = partNo.substring(0, partNo.length() - 4);
         String partNo4 = partNo.substring(partNo.length() - 4).toUpperCase();
         custGenSerialNoModel.setPartNo(prefix + partNo4);
@@ -433,7 +439,14 @@ public class MesCreateWorkOrderImpl implements IMesCreateWorkOrder {
                         orderAssemblyList = orderAssembly;
                     }
                 }
+                /**
+                 * 原pisces逻辑
+                 * add by aix 2017.4.11 增加根据PTR维护页面维护的目视单显示项来替换WORKORDERASSEMBLY中的partdesc
+                 */
                if (!Objects.isNull(orderAssemblyList)){
+                   if (orderAssemblyList.getDisplaySeq()!=null && orderAssemblyList.getDisplaySeq()!=0){
+                       orderAssemblyList.setDisplayValue(mesPartPtr.getVisualItem());
+                   }
                    orderAssemblyList.setAssemblyPartNo(mesPartSap.getPartNo());
                    orderAssemblyList.setAssemblyPartName(mesPartSap.getPartName());
                    orderAssemblyList.setMatchRule(mesPartPtr.getReplacePartSnRule());
@@ -477,6 +490,7 @@ public class MesCreateWorkOrderImpl implements IMesCreateWorkOrder {
             workOrderPartRao.saveAll(workOrderPartList);
             mesWorkOrder.setProductSeq(productSeq);
             mesWorkOrder.setPartProdGroupName(partProdGroup.getPartProdGroupName());
+            mesWorkOrder.setPtrInfo(ptrInfos.toString());
             ConvertBean.saveOrUpdate(mesWorkOrder, "MES-JOB");
             mesWorkOrderRao.insert(mesWorkOrder);
             /**

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/MesEarlyWarningServiceImpl.java

@@ -262,15 +262,18 @@ public class MesEarlyWarningServiceImpl implements IMesEarlyWarningService {
         //先查对列表,找到对应产线工位的工单
         List<MesQueueOrder> queueOrderList = queueOrderRao.findByHqlTopWhere(queueOrderPackBean,1);
         //过滤掉关闭和拆解的工单
-        List<Integer> orderStatusList1 = new ArrayList<>();
+        List<MesWorkOrder> workOrderList = new ArrayList<>();
-        orderStatusList1.add(MesExtEnumUtil.ORDER_STATUS.RELEASE.getValue());
+        if (!queueOrderList.isEmpty()){
-        orderStatusList1.add(MesExtEnumUtil.ORDER_STATUS.PROCESS.getValue());
+            List<Integer> orderStatusList1 = new ArrayList<>();
-        List<String> workOrderNoQueueList = queueOrderList.stream().map(MesQueueOrder::getWorkOrderNo).distinct().collect(Collectors.toList());
+            orderStatusList1.add(MesExtEnumUtil.ORDER_STATUS.RELEASE.getValue());
-        DdlPackBean orderPackBean = DdlPackBean.getDdlPackBean(organizeCode);
+            orderStatusList1.add(MesExtEnumUtil.ORDER_STATUS.PROCESS.getValue());
-        DdlPreparedPack.getInPackList(workOrderNoQueueList,"workOrderNo",orderPackBean);
+            List<String> workOrderNoQueueList = queueOrderList.stream().map(MesQueueOrder::getWorkOrderNo).distinct().collect(Collectors.toList());
-        DdlPreparedPack.getInPackList(orderStatusList1,"workOrderStatus",orderPackBean);
+            DdlPackBean orderPackBean = DdlPackBean.getDdlPackBean(organizeCode);
-        DdlPreparedPack.getOrderBy("productSeq",CommonEnumUtil.ASC_OR_DESC.ASC.getValue(), orderPackBean);
+            DdlPreparedPack.getInPackList(workOrderNoQueueList,"workOrderNo",orderPackBean);
-        List<MesWorkOrder> workOrderList = workOrderRao.findByHqlTopWhere(orderPackBean, 1);
+            DdlPreparedPack.getInPackList(orderStatusList1,"workOrderStatus",orderPackBean);
+            DdlPreparedPack.getOrderBy("productSeq",CommonEnumUtil.ASC_OR_DESC.ASC.getValue(), orderPackBean);
+            workOrderList = workOrderRao.findByHqlTopWhere(orderPackBean, 1);
+        }
         return !workOrderList.isEmpty() ? workOrderList.get(0) : null;
     }
 
@@ -291,7 +294,7 @@ public class MesEarlyWarningServiceImpl implements IMesEarlyWarningService {
         DdlPreparedPack.getStringNotBlanklPack("custOrderNo",workOrderPackBean);
         DdlPreparedPack.getOrderBy("productSeq",CommonEnumUtil.ASC_OR_DESC.DESC.getValue(), workOrderPackBean);
         List<MesWorkOrder> mesWorkOrders = workOrderRao.findByHqlTopWhere(workOrderPackBean, 1);
-        return mesWorkOrders.get(0);
+        return !mesWorkOrders.isEmpty() ? mesWorkOrders.get(0): null;
     }
 
     private Integer getWorkCounts(String realEndTime,String organizeCode,String workCenterCode){
@@ -404,6 +407,9 @@ public class MesEarlyWarningServiceImpl implements IMesEarlyWarningService {
         mesKanBanShowModel.setSupplyRedBuffer(supplyRedBuffer);
         //供货缓冲实际
         Long realSupplyBuffer = Long.parseLong(infoDD.getCsnNo().substring(3,10)) - Long.parseLong(infoKH.getCsnNo().substring(3,10)) - kanBan.getOnlineAdjustNum();
+       if (realSupplyBuffer < 0){
+           realSupplyBuffer = 0L;
+       }
         mesKanBanShowModel.setRealSupplyBuffer(realSupplyBuffer);
         if (realSupplyBuffer < supplyRedBuffer){
             mesKanBanShowModel.setRealSupplyBufferColor("red");
@@ -412,6 +418,7 @@ public class MesEarlyWarningServiceImpl implements IMesEarlyWarningService {
             mesKanBanShowModel.setRealSupplyBufferColor("yellow");
             mesKanBanShowModel.setSupplyRedBuffer(supplyYellowBuffer);
         }
+
         //线头积单
          Long summaryWorkOrderRedCount = kanBan.getSummaryWorkOrderRedCount();
          mesKanBanShowModel.setSummaryWorkOrderRedCount(summaryWorkOrderRedCount);
@@ -440,9 +447,9 @@ public class MesEarlyWarningServiceImpl implements IMesEarlyWarningService {
         //成品实际缓冲
         Long realProductionBuffer;
         if (workOrderLast.getCustOrderNo().length() >= 10){
-            realProductionBuffer = Long.parseLong(workOrderLast.getCustOrderNo().substring(workOrderLast.getCustOrderNo().length() - 7)) - Long.parseLong(infoKH.getCsnNo().substring(3, 10))  - kanBan.getOnlineAdjustNum() ;
+            realProductionBuffer = Long.parseLong(workOrderLast.getCustOrderNo().substring(workOrderLast.getCustOrderNo().length() - 7)) - Long.parseLong(infoKH.getCsnNo().substring(3, 10))  - kanBan.getOnlineToShippingAdjustNum() ;
         }else {
-            realProductionBuffer = Long.parseLong(workOrderLast.getCustOrderNo().substring(workOrderLast.getCustOrderNo().length() - 5)) - Long.parseLong(infoKH.getCsnNo().substring(infoKH.getCsnNo().length()-5)) - kanBan.getOnlineAdjustNum() ;
+            realProductionBuffer = Long.parseLong(workOrderLast.getCustOrderNo().substring(workOrderLast.getCustOrderNo().length() - 5)) - Long.parseLong(infoKH.getCsnNo().substring(infoKH.getCsnNo().length()-5)) - kanBan.getOnlineToShippingAdjustNum() ;
 
         }
         if(realProductionBuffer <0){

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/print/strategy/AssemblyVisualListPrintStrategy.java

@@ -79,13 +79,28 @@ public class AssemblyVisualListPrintStrategy implements IPrintTemplateStrategySe
 
         // 总个数
         Integer totalCount = partProdGroup.getTotalCount();
+        Map<Integer, List<MesWorkOrderAssembly>> collect = workOrderAssemblyList.stream().collect(Collectors.groupingBy(MesWorkOrderAssembly::getDisplaySeq));
         // 为空时显示内容
         String isNullViewContent = StringUtils.isEmpty(partProdGroup.getIsNullViewContent()) ? "" : partProdGroup.getIsNullViewContent();
-        for (Integer index = 0; index < totalCount; index++) {
+        for (int index = 0; index < collect.size(); index++) {
-            String displayValue =  workOrderAssemblyList.size() -1 < index ? isNullViewContent : workOrderAssemblyList.get(index).getDisplayValue();
+            List<MesWorkOrderAssembly> orderAssemblyList = collect.get(index+1);
+            List<String> disPlayValues = orderAssemblyList.stream().map(MesWorkOrderAssembly::getDisplayValue).distinct().collect(Collectors.toList());
+            String displayValue =isNullViewContent;
+            if(!disPlayValues.isEmpty()){
+                displayValue = String.join("\r\n", disPlayValues);
+            }
+            // String displayValue =  workOrderAssemblyList.size() -1 < index ? isNullViewContent : workOrderAssemblyList.get(index).getDisplayValue();
 
-            resultMap.put(MesExtConstWords.ASSEMBLY_PARAM + (index+1), StringUtils.isEmpty(displayValue) ? StringUtils.isEmpty(isNullViewContent) ? "" : null : displayValue);
+//            resultMap.put(MesPcnExtConstWords.ASSEMBLY_PARAM + (index+1), StringUtils.isEmpty(displayValue) ? StringUtils.isEmpty(isNullViewContent) ? "" : isNullViewContent : displayValue);
+            resultMap.put(MesExtConstWords.ASSEMBLY_PARAM + (index+1), displayValue);
         }
+        // 为空时显示内容
+//        String isNullViewContent = StringUtils.isEmpty(partProdGroup.getIsNullViewContent()) ? "" : partProdGroup.getIsNullViewContent();
+//        for (Integer index = 0; index < totalCount; index++) {
+//            String displayValue =  workOrderAssemblyList.size() -1 < index ? isNullViewContent : workOrderAssemblyList.get(index).getDisplayValue();
+//
+//            resultMap.put(MesExtConstWords.ASSEMBLY_PARAM + (index+1), StringUtils.isEmpty(displayValue) ? StringUtils.isEmpty(isNullViewContent) ? "" : null : displayValue);
+//        }
 
         printDataMapList.add(resultMap);