Browse Source

新增获取MES作业工单中的“派工时间”字段

xiaoyuzhang 3 weeks ago
parent
commit
2b49955f73

+ 1 - 0
src/main/java/cn/mrdear/controller/JobOrderController.java

@@ -70,6 +70,7 @@ public class JobOrderController {
70
                 jobOrderListVO.setDescription(mesJobOrderDTO.getDescription());
70
                 jobOrderListVO.setDescription(mesJobOrderDTO.getDescription());
71
                 jobOrderListVO.setColor(mesJobOrderDTO.getColor());
71
                 jobOrderListVO.setColor(mesJobOrderDTO.getColor());
72
                 jobOrderListVO.setType(mesJobOrderDTO.getType());
72
                 jobOrderListVO.setType(mesJobOrderDTO.getType());
73
+                jobOrderListVO.setCreateTime(DateUtil.timeFormat(mesJobOrderDTO.getCreated()));
73
                 String mProductId = mesJobOrderDTO.getmProductId();
74
                 String mProductId = mesJobOrderDTO.getmProductId();
74
                 if(productMap.containsKey(mProductId)) {
75
                 if(productMap.containsKey(mProductId)) {
75
                     jobOrderListVO.setGoodsCode(productMap.get(mProductId));
76
                     jobOrderListVO.setGoodsCode(productMap.get(mProductId));

+ 8 - 0
src/main/java/cn/mrdear/entity/vo/JobOrderListVO.java

@@ -16,7 +16,15 @@ public class JobOrderListVO {
16
     private String orderCode; // 订单号 117429040931-67090
16
     private String orderCode; // 订单号 117429040931-67090
17
     private String code; // 工单号
17
     private String code; // 工单号
18
     private String description; // 备注
18
     private String description; // 备注
19
+    private String createTime;// 开工时间
19
 
20
 
21
+    public String getCreateTime() {
22
+        return createTime;
23
+    }
24
+
25
+    public void setCreateTime(String createTime) {
26
+        this.createTime = createTime;
27
+    }
20
 
28
 
21
     public String getJobOrderId() {
29
     public String getJobOrderId() {
22
         return jobOrderId;
30
         return jobOrderId;

+ 1 - 1
src/main/resources/mapper/MesJobOrderMapper.xml

@@ -13,7 +13,7 @@
13
         <result property="mProductId" column="m_product_id"></result>
13
         <result property="mProductId" column="m_product_id"></result>
14
     </resultMap>
14
     </resultMap>
15
     <select id="getListByDate" resultMap="mesJobOrderMap">
15
     <select id="getListByDate" resultMap="mesJobOrderMap">
16
-        select emeso_job_order_id, emeso_manuorder_id, created, code,color,type, qty, description, m_product_id
16
+        select emeso_job_order_id,created, emeso_manuorder_id, created, code,color,type, qty, description, m_product_id
17
         from emeso_job_order where status in('START','CREATE') order by code desc ;
17
         from emeso_job_order where status in('START','CREATE') order by code desc ;
18
     </select>
18
     </select>
19
 
19