aps-车间作业跟踪修改字段，包含导入导出

cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ApsProcessOperationProcessEquServiceImpl.java

@@ -2661,6 +2661,8 @@ public class ApsProcessOperationProcessEquServiceImpl extends ServiceImpl<ApsPro
         //调用平台接口查询结果
         query.setCurrent(null);
         query.setSize(null);
+        query.setQuerySql(query.getQuerySql().replaceFirst("交期偏差（天）","outdueday"));
+        query.setQuerySql(query.getQuerySql().replaceFirst("是否超交期","isoutdue"));
         R listData = cxAdminFeginClient.getListData(query);
         JSONObject jsonObject = JSONObject.parseObject(JSON.toJSONString(listData.getData()));
         JSONArray records = jsonObject.getJSONArray("records");

cx-aps/cx-aps-entity/src/main/java/com/rongwei/bsentity/vo/WorkShopExportVo.java

@@ -25,16 +25,18 @@ public class WorkShopExportVo {
     private String planinput;
     @ExcelProperty("输出物料")
     private String planoutput;
-    @ExcelProperty("计划加工卷数")
-    private String planprocessrall;
+    @ExcelProperty("坯料卷数")
+    private String rollnum;
     @ExcelProperty("批次号")
     private String showbatchnumber;
     @ExcelProperty("客户名称")
     private String customname;
-    @ExcelProperty("客户订单号")
-    private String customorderno;
-    @ExcelProperty("成品规格")
+    @ExcelProperty("产品规格")
     private String productspec;
+    @ExcelProperty("承诺交货日期-起")
+    private Date promisedatestart;
+    @ExcelProperty("承诺交货日期-止")
+    private Date promisedateend;
     @ExcelProperty("辊类型")
     private String rollertype;
     @ExcelProperty("最小等待时间")
@@ -45,24 +47,28 @@ public class WorkShopExportVo {
     private String previousprocessdevice;
     @ExcelProperty("前道完工时间")
     private Date previousactualfinishdate;
+    @ExcelProperty("前道作业状态")
+    private String previousworkstatus;
     @ExcelProperty("后道加工设备")
     private String nextprocessdevice;
     @ExcelProperty("冲突")
     private String conflictdes;
-    @ExcelProperty("订单号")
-    private String orderno;
     @ExcelProperty("坯料计划编号")
     private String blanknumber;
-    @ExcelProperty("承诺交货日期-起")
-    private Date promisedatestart;
-    @ExcelProperty("承诺交货日期-止")
-    private Date promisedateend;
+    @ExcelProperty("订单号")
+    private String orderno;
+    @ExcelProperty("客户订单号")
+    private String customorderno;
     @ExcelProperty("订单产品")
     private String outputorderproduct;
+    @ExcelProperty("是否等料")
+    private String iswaiting;
     @ExcelProperty("工序")
     private String process;
     @ExcelProperty("工序显示名")
     private String processname;
+    @ExcelProperty("计划加工卷数")
+    private String planprocessrall;
     @ExcelProperty("已开工卷数")
     private String startingroll;
     @ExcelProperty("已报工卷数")
@@ -89,6 +95,10 @@ public class WorkShopExportVo {
     private Date actualstartdate;
     @ExcelProperty("实际完工时间")
     private Date actualfinishdate;
+    @ExcelProperty("是否超交期")
+    private String isoutdue;
+    @ExcelProperty("交期偏差（天）")
+    private String outdueday;
     @ExcelProperty("坯料生产状态")
     private String productstatus;
     @ExcelProperty("是否锁定")