change - 定时上传ERP生产计划管理个人详情、通过planCode查询生产工单执行用户列表

os-mes/src/main/java/com/os/mes/api/domain/ERPPersonalDetail.java

@@ -0,0 +1,74 @@
+package com.os.mes.api.domain;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * erp生产计划管理个人详情
+ *
+ * @author Yinq
+ * @date 2024-07-02
+ */
+public class ERPPersonalDetail implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 上班时间
+     */
+    @JsonProperty(value = "workontime")
+    private String workontime;
+
+    /**
+     * 下班时间
+     */
+    @JsonProperty(value = "workofftime")
+    private String workofftime;
+
+    /**
+     * 身份证
+     */
+    @JsonProperty(value = "IDCard")
+    private String card;
+
+    /**
+     * 完成工作量
+     */
+    @JsonProperty(value = "workload")
+    private BigDecimal workload;
+
+    public String getCard() {
+        return card;
+    }
+
+    public void setCard(String card) {
+        this.card = card;
+    }
+
+    public String getWorkontime() {
+        return workontime;
+    }
+
+    public void setWorkontime(String workontime) {
+        this.workontime = workontime;
+    }
+
+    public String getWorkofftime() {
+        return workofftime;
+    }
+
+    public void setWorkofftime(String workofftime) {
+        this.workofftime = workofftime;
+    }
+
+    public BigDecimal getWorkload() {
+        return workload;
+    }
+
+    public void setWorkload(BigDecimal workload) {
+        this.workload = workload;
+    }
+
+
+}

os-mes/src/main/java/com/os/mes/api/domain/ERPPersonalDetails.java

@@ -0,0 +1,93 @@
+package com.os.mes.api.domain;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * erp生产计划管理个人详情接口
+ * 
+ * @author Yinq
+ * @date 2024-07-02
+ */
+public class ERPPersonalDetails implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 应用代码
+     */
+    @JsonProperty(value = "AppCode")
+    private String AppCode;
+
+    /**
+     * 控制器
+     */
+    @JsonProperty(value = "Controller")
+    private String Controller;
+
+    /**
+     * 动作名称
+     */
+    @JsonProperty(value = "ActionName")
+    private String ActionName;
+
+    /** 生产计划流水号 */
+    @JsonProperty(value = "plancode")
+    private String plancode;
+
+    /** 员工详细信息 */
+    @JsonProperty(value = "userdatas")
+    private List<ERPPersonalDetail> userdatas;
+
+    public String getAppCode() {
+        return AppCode;
+    }
+
+    public void setAppCode(String appCode) {
+        AppCode = appCode;
+    }
+
+    public String getController() {
+        return Controller;
+    }
+
+    public void setController(String controller) {
+        Controller = controller;
+    }
+
+    public String getActionName() {
+        return ActionName;
+    }
+
+    public void setActionName(String actionName) {
+        ActionName = actionName;
+    }
+
+    public String getPlancode() {
+        return plancode;
+    }
+
+    public void setPlancode(String plancode) {
+        this.plancode = plancode;
+    }
+
+    public List<ERPPersonalDetail> getUserdatas() {
+        return userdatas;
+    }
+
+    public void setUserdatas(List<ERPPersonalDetail> userdatas) {
+        this.userdatas = userdatas;
+    }
+
+    @Override
+    public String toString() {
+        return "ERPPersonalDetails{" +
+                "AppCode='" + AppCode + '\'' +
+                ", Controller='" + Controller + '\'' +
+                ", ActionName='" + ActionName + '\'' +
+                ", plancode='" + plancode + '\'' +
+                ", userdatas=" + userdatas +
+                '}';
+    }
+}

os-mes/src/main/java/com/os/mes/api/service/IERPPortService.java

@@ -60,4 +60,10 @@ public interface IERPPortService {
      */
     void getProductionPlanTask(ERPParamDto paramDto);
 
+    /**
+     * 定时上传ERP生产计划管理个人详情
+     * @param paramDto
+     */
+    void getProdPlanPersonalDetailsTask(ERPParamDto paramDto);
+
 }

os-mes/src/main/java/com/os/mes/prod/mapper/ProdPlanExecuteUserMapper.java

@@ -66,4 +66,11 @@ public interface ProdPlanExecuteUserMapper {
      * @return 生产工单聚合执行用户集合
      */
     List<ProdPlanExecuteUser> selectAggProdPlanExecuteUserList(ProdPlanExecuteUser prodPlanExecuteUser);
+
+    /**
+     * 通过planCode查询生产工单执行用户列表
+     * @param planCode
+     * @return
+     */
+    List<ProdPlanExecuteUser> selectPlanExecuteUserListByPlanCode(String planCode);
 }

os-mes/src/main/java/com/os/mes/prod/service/IProdPlanExecuteUserService.java

@@ -58,4 +58,11 @@ public interface IProdPlanExecuteUserService {
      * @return 结果
      */
     public int deleteProdPlanExecuteUserByObjId(Long objId);
+
+    /**
+     * 通过planCode查询生产工单执行用户列表
+     * @param planCode
+     * @return
+     */
+    public List<ProdPlanExecuteUser> selectPlanExecuteUserListByPlanCode(String planCode);
 }

os-mes/src/main/java/com/os/mes/prod/service/impl/ProdPlanErpInfoServiceImpl.java

@@ -2,6 +2,7 @@ package com.os.mes.prod.service.impl;
 
 import java.util.List;
 
+import com.os.common.constant.MesConstants;
 import com.os.common.utils.DateUtils;
 import com.os.common.utils.StringUtils;
 import com.os.mes.base.domain.BaseDeviceLedger;
@@ -129,6 +130,10 @@ public class ProdPlanErpInfoServiceImpl implements IProdPlanErpInfoService {
                 prodPlanInfo.setPlanCode(seqNo);
                 List<ProdPlanInfo> planInfoList = prodPlanInfoService.selectProdPlanInfoList(prodPlanInfo);
                 ProdPlanInfo planInfo = planInfoList.get(0);
+                if (planInfo.getUploadFlag().equals(MesConstants.MES_IS_ERP_YES) || planInfo.getPlanStatus().equals(MesConstants.MES_PLAN_STATUS_FINISH)
+                        || planInfo.getPlanStatus().equals(MesConstants.MES_PLAN_STATUS_IN)) {
+                    continue;
+                }
                 planInfo.setPlanCode(seqNo);
                 planInfo.setOrderCode(planErpInfo.getTaskCode());
                 planInfo.setPlanAmount(planErpInfo.getWorkload());
@@ -155,7 +160,7 @@ public class ProdPlanErpInfoServiceImpl implements IProdPlanErpInfoService {
                 planInfo.setPlanEndTime(planErpInfo.getPlanEndTime());
                 planInfo.setTeamCode(planErpInfo.getTeamNo());
                 planInfo.setMaterialName(planErpInfo.getConveyorLengthSpecification());
-                planInfo.setPlanStatus("0");
+                planInfo.setPlanStatus("4");
                 planInfo.setImportFlag("1");
                 prodPlanInfoService.insertProdPlanInfo(planInfo);
                 this.insertProdPlanErpInfo(planErpInfo);

os-mes/src/main/java/com/os/mes/prod/service/impl/ProdPlanExecuteUserServiceImpl.java

@@ -1,5 +1,6 @@
 package com.os.mes.prod.service.impl;
 
+import java.util.Collections;
 import java.util.List;
 
 import org.springframework.beans.factory.annotation.Autowired;
@@ -84,4 +85,14 @@ public class ProdPlanExecuteUserServiceImpl implements IProdPlanExecuteUserServi
     public int deleteProdPlanExecuteUserByObjId(Long objId) {
         return prodPlanExecuteUserMapper.deleteProdPlanExecuteUserByObjId(objId);
     }
+
+    /**
+     * 通过planCode查询生产工单执行用户列表
+     * @param planCode
+     * @return
+     */
+    @Override
+    public List<ProdPlanExecuteUser> selectPlanExecuteUserListByPlanCode(String planCode) {
+        return prodPlanExecuteUserMapper.selectPlanExecuteUserListByPlanCode(planCode);
+    }
 }

os-mes/src/main/resources/mapper/mes/prod/ProdPlanExecuteUserMapper.xml

@@ -208,4 +208,22 @@
             #{objId}
         </foreach>
     </delete>
+
+    <select id="selectPlanExecuteUserListByPlanCode" parameterType="String" resultMap="ProdPlanExecuteUserResult">
+        select ppeu.order_code,
+               ppeu.plan_code,
+               ppeu.process_code,
+               ppeu.station_code,
+               ppeu.staff_id,
+               bsi.pass_word,
+               sum(ppeu.complete_amount) complete_amount,
+               min(ppd.begin_time) plan_begin_date,
+               max(ppd.end_time)   plan_end_date
+        from prod_plan_execute_user ppeu
+                 left join base_staff_info bsi on bsi.staff_id = ppeu.staff_id
+                 left join prod_plan_detail ppd on ppd.plan_code = ppeu.plan_code and ppd.batch_number = ppeu.batch_number
+        where ppeu.plan_code = #{planCode}
+        GROUP BY ppeu.order_code, ppeu.plan_code, ppeu.process_code, ppeu.station_code, ppeu.staff_id, bsi.pass_word
+    </select>
+
 </mapper>

os-quartz/src/main/java/com/os/quartz/task/ERPTask.java

@@ -59,6 +59,16 @@ public class ERPTask {
         portService.getProductionPlanTask(paramDto);
     }
 
+    public void ERPProdPlanPersonalDetailsTask(Long startDays, Long endDays) {
+        //获取生产计划管理个人详情
+        String startDate = convertDaysToDateString(startDays, 0);
+        String endDate = convertDaysToDateString(endDays, 1);
+        ERPParamDto paramDto = new ERPParamDto();
+        paramDto.setPlanStartTime(startDate);
+        paramDto.setPlanEndTime(endDate);
+        portService.getProdPlanPersonalDetailsTask(paramDto);
+    }
+
     /**
      * 输出days天type的日期
      * type: 0-减法；1-加法