计划模块(工单修改BUG解决初版)

op-modules/op-plan/src/main/java/com/op/plan/domain/ProOrderWorkorder.java

@@ -78,9 +78,20 @@ public class ProOrderWorkorder extends TreeEntity {
     }
 
     /** 产线编码 */
-    @Excel(name = "产线")
+    @Excel(name = "线体")
     private String prodLineCode;
 
+    // TODO 暂时存放线体编码
+    private String prodLineName;
+
+    public String getProdLineName() {
+        return prodLineName;
+    }
+
+    public void setProdLineName(String prodLineName) {
+        this.prodLineName = prodLineName;
+    }
+
     /** 工单生产日期 */
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "工单生产日期", width = 30, dateFormat = "yyyy-MM-dd")
@@ -490,6 +501,7 @@ public class ProOrderWorkorder extends TreeEntity {
                 .append("planTime",getPlanTime())
                 .append("bucketName",getBucketName())
                 .append("routeName",getRouteName())
+                .append("prodLineName",getProdLineName())
                 .toString();
     }
 }

op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java

@@ -76,6 +76,8 @@ public class ProOrderWorkorderServiceImpl implements IProOrderWorkorderService {
     public List<ProOrderWorkorder> selectProOrderWorkorderList(ProOrderWorkorder proOrderWorkorder) {
         List<ProOrderWorkorder> workorderList = proOrderWorkorderMapper.selectProOrderWorkorderList(proOrderWorkorder);
         for (ProOrderWorkorder workorder : workorderList) {
+            // TODO 暂存线体code
+            workorder.setProdLineName(workorder.getProdLineCode());
             // 通过设备code查询出机型名称
             workorder.setProdLineCode(proOrderMapper.selectProdLineName(workorder.getProdLineCode()));
             // 通过工艺编码code查询出机型名称
@@ -597,6 +599,8 @@ public class ProOrderWorkorderServiceImpl implements IProOrderWorkorderService {
     private void formatProOrderWorkorder(ProOrderWorkorder proOrderWorkorder) {
         // 通过班次id查询班次名称
         String shiftDesc = proOrderMapper.selectShiftNameById(proOrderWorkorder.getShiftId());
+        // TODO 暂时存放线体code
+        proOrderWorkorder.setProdLineName(proOrderWorkorder.getProdLineCode());
         // 通过设备code查询出机型名称
         String prodLineName = proOrderMapper.selectProdLineName(proOrderWorkorderMapper.selectProOrderWorkorderByWorkorderId(proOrderWorkorder.getWorkorderId()).getProdLineCode());
         // 通过工单id查询批次号