feature:

生产任务功能的查询copy表换成正式表

src/main/java/com/qlm/controller/jinzai/NewReportController.java

@@ -52,7 +52,7 @@ public class NewReportController extends CommonController {
                 endTime = DateUtil.formatDateTime(end);
             }
             String selectColumns = "select distinct task_no, d.factory_name,e.workshop_name, a.sku,c.item_name, produce_date, DATE_FORMAT(guo_time, '%Y-%m-%d') AS guo_date";
-            StringBuilder sql = new StringBuilder("from jinzai_upload_master_copy a");
+            StringBuilder sql = new StringBuilder("from jinzai_upload_master a");
             sql.append(" left join t_jz_device b on a.device_no = b.device_no");
             sql.append(" left join t_jz_item c on a.sku = c.sku");
             sql.append(" left join t_factory d on b.factory_id = d.id");
@@ -98,7 +98,7 @@ public class NewReportController extends CommonController {
             String taskNo = getPara("task_no");
             String sku = getPara("sku");
             String selectColumns = "select id as code";
-            StringBuilder sql = new StringBuilder(" from jinzai_upload_master_copy where task_no = ? and sku = ?");
+            StringBuilder sql = new StringBuilder(" from jinzai_upload_master where task_no = ? and sku = ?");
             List<Object> params = new ArrayList<>();
             params.add(taskNo);
             params.add(sku);
@@ -140,12 +140,12 @@ public class NewReportController extends CommonController {
             }
 
             // 先查询总数（使用DISTINCT）
-            String countSql = "select count(distinct duo_code) from jinzai_upload_master_copy" + whereSql;
+            String countSql = "select count(distinct duo_code) from jinzai_upload_master" + whereSql;
             Long totalRow = Db.queryLong(countSql, params.toArray());
 
             // 再查询分页数据
             String selectColumns = "select distinct duo_code as code";
-            String dataSql = " from jinzai_upload_master_copy" + whereSql;
+            String dataSql = " from jinzai_upload_master" + whereSql;
             Page<Record> paginate = Db.paginate(pageNumber, pageSize, selectColumns, dataSql, params.toArray());
 
             if(paginate == null){
@@ -179,7 +179,7 @@ public class NewReportController extends CommonController {
         productionTotalVO.setGuoDate(record.getStr("guo_date"));
         productionTotalVO.setWorkshopName(record.getStr("workshop_name"));
         //根据taskNo 和 Sku  查询数量
-        Long quantity = Db.queryLong("select count(id) quantity from jinzai_upload_master_copy where task_no = ? and sku = ?", record.getStr("task_no"), record.getStr("sku"));
+        Long quantity = Db.queryLong("select count(id) quantity from jinzai_upload_master where task_no = ? and sku = ?", record.getStr("task_no"), record.getStr("sku"));
         if(quantity == null){
             quantity = 0L;
         }

src/main/java/com/qlm/controller/jinzai/ProdBatchController.java

@@ -65,11 +65,11 @@ public class ProdBatchController extends CommonController {
         String productName = getPara("productName");
         String wmsStatus = getPara("wmsStatus");
         try {
-            StringBuilder whereSql = new StringBuilder(" from jinzai_upload_master_copy where 1=1");
+            StringBuilder whereSql = new StringBuilder(" from jinzai_upload_master where 1=1");
             List<Object> params = new ArrayList<>();
             if(StrKit.notBlank(createTime)){
                 //创建时间 =
-                whereSql.append(" and create_time = ?");
+                whereSql.append(" and upload_time = ?");
                 params.add(createTime);
             }
 //            if(StrKit.notBlank(factoryId)){
@@ -318,7 +318,7 @@ public class ProdBatchController extends CommonController {
         //单号/箱码/托码 对应的修改之前的 品项sku
         Map<String,String> referenceCodeAndSku = new HashMap<>();
         if(modifyType.compareTo(1) == 0){
-            Record first = Db.findFirst("select * from jinzai_upload_master_copy where task_no = ?", referenceCodes.get(0));
+            Record first = Db.findFirst("select * from jinzai_upload_master where task_no = ?", referenceCodes.get(0));
             if(first == null){
                 return ApiResponse.error("单号不存在");
             }
@@ -327,7 +327,7 @@ public class ProdBatchController extends CommonController {
             String codeList = referenceCodes.stream()
                     .map(code -> "'" + code + "'")
                     .collect(java.util.stream.Collectors.joining(","));
-            List<Record> masterRecords = Db.find("select * from jinzai_upload_master_copy where id in(" + codeList + ")");
+            List<Record> masterRecords = Db.find("select * from jinzai_upload_master where id in(" + codeList + ")");
             if(masterRecords.size() != referenceCodes.size()){
                 return ApiResponse.error("有箱码不存在");
             }
@@ -338,7 +338,7 @@ public class ProdBatchController extends CommonController {
             String codeList = referenceCodes.stream()
                     .map(code -> "'" + code + "'")
                     .collect(java.util.stream.Collectors.joining(","));
-            List<Record> duoRecords = Db.find("select * from jinzai_upload_master_copy where duo_code in(" + codeList + ")");
+            List<Record> duoRecords = Db.find("select * from jinzai_upload_master where duo_code in(" + codeList + ")");
             if(duoRecords.size() != referenceCodes.size()){
                 return ApiResponse.error("有托码不存在");
             }
@@ -398,11 +398,11 @@ public class ProdBatchController extends CommonController {
                     Db.save("t_item_modify_record", record);
                 }
                 if (modifyType.compareTo(1) == 0) {
-                    Db.update("update jinzai_upload_master_copy set upload_time = null,pinxiang = ?,kouwei = ?,sku = ? where task_no = ?", itemName, itemKouWei,sku, referenceCodes.get(0));
+                    Db.update("update jinzai_upload_master set upload_time = null,pinxiang = ?,kouwei = ?,sku = ? where task_no = ?", itemName, itemKouWei,sku, referenceCodes.get(0));
                 } else if (modifyType.compareTo(2) == 0) {
-                    Db.update("update jinzai_upload_master_copy set upload_time = null,pinxiang = ?,kouwei = ?,sku = ? where id in(" + addReferenceCode + ")", itemName, itemKouWei,sku);
+                    Db.update("update jinzai_upload_master set upload_time = null,pinxiang = ?,kouwei = ?,sku = ? where id in(" + addReferenceCode + ")", itemName, itemKouWei,sku);
                 } else if (modifyType.compareTo(3) == 0) {
-                    Db.update("update jinzai_upload_master_copy set upload_time = null,pinxiang = ?,kouwei = ?,sku = ? where duo_code in(" + addReferenceCode + ")", itemName, itemKouWei,sku);
+                    Db.update("update jinzai_upload_master set upload_time = null,pinxiang = ?,kouwei = ?,sku = ? where duo_code in(" + addReferenceCode + ")", itemName, itemKouWei,sku);
                 }
                 return true;
             } catch (Exception e) {