Merge remote-tracking branch 'origin/master'

mes/src/main/java/com/ximai/mes/pro/domain/proWorkOrder/ProWorkOrderProcess.java

@@ -112,6 +112,12 @@ public class ProWorkOrderProcess extends BaseEntity {
     @Excel(name = "工序名称")
     private String processName;
 
+    /**
+     * 单价
+     */
+    private BigDecimal unitPrice;
+
+
     /**
      * 工序总数量
      */

mes/src/main/java/com/ximai/mes/pro/domain/task/ProTaskWorkunit.java

@@ -203,4 +203,13 @@ public class ProTaskWorkunit extends BaseEntity {
     private String customerProjectNo;
     @ApiModelProperty("任务批号")
     private String taskBatch;
+
+    @ApiModelProperty("标准工时")
+    private BigDecimal stdWorkingTime;
+
+    @ApiModelProperty("工时单位")
+    private String stdWorkingTimeUom;
+
+    @ApiModelProperty("单价")
+    private BigDecimal unitPrice;
 }

mes/src/main/java/com/ximai/mes/pro/domain/vo/ProWorkOrderProcessVo.java

@@ -173,6 +173,10 @@ public class ProWorkOrderProcessVo extends BaseEntity {
 
     @ApiModelProperty("是否外协")
     private String outsourced;
+    /**
+     * 单价
+     */
+    private BigDecimal unitPrice;
 
     /**
      * 工序物料

mes/src/main/java/com/ximai/mes/pro/schedule/Task.java

 package com.ximai.mes.pro.schedule;
 
 import cn.hutool.core.bean.BeanUtil;
+import com.ximai.common.annotation.Excel;
 import com.ximai.mes.pro.domain.productionSolution.ProProductionSolutionProcess;
 import com.ximai.mes.pro.domain.productionSolution.ProProductionSolutionSpecificationSheet;
 import io.swagger.annotations.ApiModelProperty;
@@ -68,6 +69,21 @@ public class Task {
      */
     private String idx;
 
+    /**
+     * 标准工时
+     */
+    private BigDecimal stdWorkingTime;
+
+    /**
+     * 工时单位
+     */
+    private String stdWorkingTimeUom;
+
+    /**
+     * 单价
+     */
+    private BigDecimal unitPrice;
+
     /**
      * 工作中心名称
      */
@@ -99,6 +115,8 @@ public class Task {
      */
     private boolean outsourced=false;
 
+
+
     /*
      * Task Data
      */

mes/src/main/java/com/ximai/mes/pro/schedule/impl/AlgorithmDataSourceImpl.java

@@ -158,6 +158,9 @@ public class AlgorithmDataSourceImpl implements AlgorithmDataSource {
                 task.setStandardWorkingTime(Duration.ZERO);
                 task.setSetupTime(Duration.ZERO);
                 task.setProcessId(routingItem.getProcessId());
+                task.setUnitPrice(routingItem.getUnitPrice());
+                task.setStdWorkingTime(routingItem.getStdWorkingTime());
+                task.setStdWorkingTimeUom(routingItem.getStdWorkingTimeUom());
                 task.setIdx(routingItem.getIdx());
                 task.setProcessName(routingItem.getProcessName());
                 task.setOrderQuantity(scheduleJobGroup.getQuantity());

mes/src/main/java/com/ximai/mes/pro/schedule/impl/AlgorithmResultProcessImpl.java

@@ -164,6 +164,9 @@ public class AlgorithmResultProcessImpl implements AlgorithmResultProcess {
         taskWorkunit.setQuantityUnqualify(BigDecimal.ZERO);
         taskWorkunit.setStatus(TaskStatusEnum.PREPARE.getStatus());
         taskWorkunit.setOutsourced(0);
+        taskWorkunit.setUnitPrice(task.getUnitPrice());
+        taskWorkunit.setStdWorkingTime(task.getStdWorkingTime());
+        taskWorkunit.setStdWorkingTimeUom(task.getStdWorkingTimeUom());
         LocalDateTime sdate = scheduleStartDate.plus(task.getScheduledStartedTime());
         LocalDateTime edate = scheduleStartDate.plus(task.getScheduledEndedTime());
         Date sdate1 = Date.from(sdate.atZone(ZoneId.systemDefault()).toInstant());

mes/src/main/resources/mapper/pro/proWorkOrder/ProWorkOrderProcessMapper.xml

@@ -25,6 +25,7 @@
         <result property="workstationName" column="workstation_name"/>
         <result property="stdWorkingTimeUom" column="std_working_time_uom"/>
         <result property="idx" column="idx"/>
+        <result property="unitPrice" column="unit_price"/>
         <result property="createBy" column="create_by"/>
         <result property="createTime" column="create_time"/>
         <result property="updateBy" column="update_by"/>
@@ -122,6 +123,7 @@
             <if test="quantity != null">quantity,</if>
             <if test="lineBreakTime != null">line_break_time,</if>
             <if test="idx != null">idx,</if>
+            <if test="unitPrice != null">unit_price,</if>
             <if test="createBy != null">create_by,</if>
             <if test="createTime != null">create_time,</if>
             <if test="updateBy != null">update_by,</if>
@@ -146,6 +148,7 @@
             <if test="quantity != null">#{quantity},</if>
             <if test="lineBreakTime != null">#{lineBreakTime},</if>
             <if test="idx != null">#{idx},</if>
+            <if test="unitPrice != null">#{unitPrice},</if>
             <if test="createBy != null">#{createBy},</if>
             <if test="createTime != null">#{createTime},</if>
             <if test="updateBy != null">#{updateBy},</if>
@@ -174,6 +177,7 @@
             <if test="quantity != null">quantity = #{quantity},</if>
             <if test="lineBreakTime != null">line_break_time = #{lineBreakTime},</if>
             <if test="idx != null">idx = #{idx},</if>
+            <if test="unitPrice != null">unit_price = #{unitPrice},</if>
             <if test="updateBy != null">update_by = #{updateBy},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
 

mes/src/main/resources/mapper/pro/task/ProTaskWorkunitMapper.xml

@@ -26,6 +26,9 @@
         <result property="vendorId" column="vendor_id"/>
         <result property="vendorName" column="vendor_name"/>
         <result property="outsourced" column="outsourced"/>
+        <result property="stdWorkingTime" column="std_working_time"/>
+        <result property="stdWorkingTimeUom" column="std_working_time_uom"/>
+        <result property="unitPrice" column="unit_price"/>
     </resultMap>
 
     <sql id="selectProTaskWorkunitVo">
@@ -116,6 +119,9 @@
             <if test="vendorId != null">vendor_id,</if>
             <if test="vendorName != null">vendor_name,</if>
             <if test="outsourced != null">outsourced,</if>
+            <if test="stdWorkingTime != null">std_working_time,</if>
+            <if test="stdWorkingTimeUom != null">std_working_time_uom,</if>
+            <if test="unitPrice != null">unit_price,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="taskId != null">#{taskId},</if>
@@ -137,6 +143,9 @@
             <if test="vendorId != null">#{vendorId},</if>
             <if test="vendorName != null">#{vendorName},</if>
             <if test="outsourced != null">#{outsourced},</if>
+            <if test="stdWorkingTime != null">#{stdWorkingTime},</if>
+            <if test="stdWorkingTimeUom != null">#{stdWorkingTimeUom},</if>
+            <if test="unitPrice != null">#{unitPrice},</if>
         </trim>
     </insert>
 
@@ -163,6 +172,9 @@
             <if test="vendorId != null">vendor_id = #{vendorId},</if>
             <if test="vendorName != null">vendor_name = #{vendorName},</if>
             <if test="outsourced != null">outsourced = #{outsourced},</if>
+            <if test="stdWorkingTime != null">std_working_time = #{stdWorkingTime},</if>
+            <if test="stdWorkingTimeUom != null">std_working_time_uom = #{stdWorkingTimeUom},</if>
+            <if test="unitPrice != null">unit_price = #{unitPrice},</if>
         </trim>
         where task_workunit_id = #{taskWorkunitId}
     </update>