From ee24ae7c2ab47e22c1bb84c017f129689f4010bf Mon Sep 17 00:00:00 2001
From: baoge <751575283@qq.com>
Date: Sun, 8 Oct 2023 13:25:08 +0800
Subject: [PATCH] =?UTF-8?q?add:=E8=AE=A2=E5=8D=95=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E7=94=9F=E4=BA=A7=E6=95=B0=E9=87=8F=E7=AD=89=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=EF=BC=9B=20fix=EF=BC=9A=E4=BF=AE=E5=A4=8D=E7=9B=B8=E5=90=8C?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=8F=B7=E7=9B=B8=E5=90=8C=E5=93=81=E7=9B=AE?=
 =?UTF-8?q?=E7=9B=B8=E5=90=8C=E4=BA=A4=E6=9C=9F=E5=90=88=E5=B9=B6=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E6=97=A0=E8=AE=A2=E5=8D=95=E5=8F=B7=E6=97=B6=E7=9A=84?=
 =?UTF-8?q?bug=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../saleorder/service/dao/MpsSaleOrder.java   |  15 ++
 .../dao/mapper/xml/MpsSaleOrderMapper.xml     |   8 +-
 .../service/impl/MpsSaleOrderServiceImpl.java |  73 ++++--
 .../PcsIfPurchaseorderController.java         |   9 +
 .../purchase/dao/PcsIfPurchaseorder.java      |   5 -
 .../src/views/wms/pcs/purchaseorder/index.vue |   2 +-
 .../src/views/wms/pcs/purchaseplan/index.vue  |   2 +-
 mes/qd/src/views/wms/pcs/saleorder/Dialog.vue |  24 +-
 mes/qd/src/views/wms/pcs/saleorder/index.vue  | 245 +++++++++++-------
 9 files changed, 244 insertions(+), 139 deletions(-)

diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/saleorder/service/dao/MpsSaleOrder.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/saleorder/service/dao/MpsSaleOrder.java
index af12cf95..8c4b2350 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/saleorder/service/dao/MpsSaleOrder.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/saleorder/service/dao/MpsSaleOrder.java
@@ -261,4 +261,19 @@ public class MpsSaleOrder implements Serializable{
       */
      @ApiModelProperty(value = "/**后段提交标记*/")
      private String behind_submit_flag;
+     /**
+      * 需生产数量
+      */
+     @ApiModelProperty(value = "/**需生产数量*/")
+     private BigDecimal need_product_qty;
+     /**
+      * 刻字数量
+      */
+     @ApiModelProperty(value = "/**刻字数量*/")
+     private BigDecimal lettering_qty;
+     /**
+      * 刻字数量
+      */
+     @ApiModelProperty(value = "/**入库数量*/")
+     private BigDecimal in_storage_qty;
 }
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/saleorder/service/dao/mapper/xml/MpsSaleOrderMapper.xml b/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/saleorder/service/dao/mapper/xml/MpsSaleOrderMapper.xml
index 22750a36..b374fc9b 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/saleorder/service/dao/mapper/xml/MpsSaleOrderMapper.xml
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/saleorder/service/dao/mapper/xml/MpsSaleOrderMapper.xml
@@ -9,6 +9,8 @@
         DATE_FORMAT(der.behind_plandeliver_date, '%Y-%m-%d' ) AS behindPlandeliverDate,
         DATE_FORMAT(der.create_time, '%Y-%m-%d %H:%i:%s' ) AS createTime,
         DATE_FORMAT(der.aps_update_time, '%Y-%m-%d %H:%i:%s' ) AS apsUpdateTime,
+        DATE_FORMAT(DATE_ADD(der.plandeliver_date, INTERVAL 7 DAY), '%Y-%m-%d') AS order_date,
+        DATE_FORMAT(DATE_ADD(der.plandeliver_date, INTERVAL 3 DAY), '%Y-%m-%d') AS warehousing_date,
         mater.material_name
         FROM
         mps_sale_order der
@@ -22,13 +24,13 @@
                 and der.status = #{query.status}
             </if>
             <if test="query.sale_type  != null">
-                and der.sale_type >= #{query.sale_type}
+                and der.sale_type = #{query.sale_type}
             </if>
             <if test="query.create_mode  != null">
-                and der.create_mode >= #{query.create_mode}
+                and der.create_mode = #{query.create_mode}
             </if>
             <if test="query.cust_code  != null">
-                and der.cust_code >= #{query.cust_code}
+                and der.cust_code = #{query.cust_code}
             </if>
             <if test="query.start_time != null and query.start_time  != ''">
                 and der.create_time >=  #{query.start_time}
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/saleorder/service/impl/MpsSaleOrderServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/saleorder/service/impl/MpsSaleOrderServiceImpl.java
index 0370346f..d6a57ccc 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/saleorder/service/impl/MpsSaleOrderServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/saleorder/service/impl/MpsSaleOrderServiceImpl.java
@@ -160,6 +160,9 @@ public class MpsSaleOrderServiceImpl extends ServiceImpl<MpsSaleOrderMapper,MpsS
      @Override
      public void update(JSONObject form) {
           MpsSaleOrder mpsSaleOrder = form.toJavaObject(MpsSaleOrder.class);
+          mpsSaleOrder.setUpdate_id(SecurityUtils.getCurrentUserId());
+          mpsSaleOrder.setUpdate_name(SecurityUtils.getCurrentUsername());
+          mpsSaleOrder.setUpdate_time(DateUtil.now());
           this.updateById(mpsSaleOrder);
      }
 
@@ -226,20 +229,33 @@ public class MpsSaleOrderServiceImpl extends ServiceImpl<MpsSaleOrderMapper,MpsS
                               if(StringUtils.isBlank(col)) {
                                    throw new BadRequestException("销售单号不能为空");
                               }
+                              if(col.equals("660697961")) {
+                                   int is = 0;
+                              }
                               mpsSaleOrder.setSale_code(col);
                          }
                          if(j == 1) {
-                              if(StringUtils.isBlank(col)) {
-                                   throw new BadRequestException("合同号不能为空");
-                              }
+                              //                              if(StringUtils.isBlank(col)) {
+                              //                                   throw new BadRequestException("合同号不能为空");
+                              //                              }
                               mpsSaleOrder.setContract_code(col);
                          }
                          if(j == 2) {
+                              mpsSaleOrder.setMaterial_code(col);
+                         }
+                         if(j == 3) {
                               if(StringUtils.isBlank(col)) {
                                    throw new BadRequestException("规格名称不能为空");
                               }
-                              List<MdMeMaterialbase> meMaterialBases = materialbaseService.list(new QueryWrapper<MdMeMaterialbase>().eq("material_spec", col));
+                              List<MdMeMaterialbase> meMaterialBases;
+                              if(StringUtils.isNotBlank(mpsSaleOrder.getMaterial_code())) {
+                                   meMaterialBases = materialbaseService.list(new QueryWrapper<MdMeMaterialbase>().eq("material_code", mpsSaleOrder.getMaterial_code()));
+                              }
+                              else{
+                                   meMaterialBases = materialbaseService.list(new QueryWrapper<MdMeMaterialbase>().eq("material_spec", col));
+                              }
                               if(CollectionUtils.isEmpty(meMaterialBases)) {
+                                   //如果不是一线物料，就跳过不导入该订单
                                    break;
                               }
                               else{
@@ -258,14 +274,14 @@ public class MpsSaleOrderServiceImpl extends ServiceImpl<MpsSaleOrderMapper,MpsS
                                    }
                               }
                          }
-                         if(j == 3) {
+                         if(j == 4) {
                               if(StringUtils.isBlank(col)) {
                                    mpsSaleOrder.setProduct_area("A1");
                               }
                               //智能一线，智能三线
                               mpsSaleOrder.setProduct_area(col.contains("三") || col.contains("3") ? "A3" : "A1");
                          }
-                         if(j == 4) {
+                         if(j == 5) {
                               if(StringUtils.isBlank(col)) {
                                    throw new BadRequestException("销售数量不能为空");
                               }
@@ -283,7 +299,7 @@ public class MpsSaleOrderServiceImpl extends ServiceImpl<MpsSaleOrderMapper,MpsS
                                    break;
                               }
                          }
-                         if(j == 5) {
+                         if(j == 6) {
                               if(StringUtils.isBlank(col)) {
                                    throw new BadRequestException("订单交期不能为空");
                               }
@@ -307,27 +323,30 @@ public class MpsSaleOrderServiceImpl extends ServiceImpl<MpsSaleOrderMapper,MpsS
                               //后段交期
                               mpsSaleOrder.setBehind_plandeliver_date(newDate.format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
                          }
-                         if(j == 6) {
+                         if(j == 7) {
                               if(StringUtils.isNotBlank(col)) {
                                    mpsSaleOrder.setRawmaterial_name(col);
                               }
                          }
-                         if(j == 7) {
+                         if(j == 8) {
                               if(StringUtils.isNotBlank(col)) {
                                    BigDecimal rateQty = BigDecimal.valueOf(NumberUtils.isNumber(col) ? NumberUtils.toDouble(col) : 0);
                                    mpsSaleOrder.setRate_qty(rateQty);
                               }
                          }
-                         if(j == 8) {
+                         if(j == 9) {
                               if(StringUtils.isNotBlank(col)) {
                                    BigDecimal canuseQty = BigDecimal.valueOf(NumberUtils.isNumber(col) ? NumberUtils.toDouble(col) : 0);
                                    mpsSaleOrder.setCanuse_qty(canuseQty);
                               }
                          }
-                         if(j == 9) {
+                         if(j == 10) {
+                              //已完成数量
                               if(StringUtils.isNotBlank(col)) {
                                    BigDecimal productQty = BigDecimal.valueOf(NumberUtils.isNumber(col) ? NumberUtils.toDouble(col) : 0);
                                    mpsSaleOrder.setProduct_qty(productQty);
+                                   //需生产数量
+                                   mpsSaleOrder.setNeed_product_qty(mpsSaleOrder.getSale_qty().subtract(productQty));
                               }
                          }
                     }
@@ -337,24 +356,24 @@ public class MpsSaleOrderServiceImpl extends ServiceImpl<MpsSaleOrderMapper,MpsS
                          int seqNo = orderSeqNoMap.getOrDefault(orderCode, 0) + 1;
                          orderSeqNoMap.put(orderCode, seqNo);
                          mpsSaleOrder.setSeq_no(seqNo * 100);
-                    }
-                    OrderQuery orderQuery = new OrderQuery();
-                    orderQuery.setSale_code(mpsSaleOrder.getSale_code());
-                    orderQuery.setStatus(SaleOrderEnum.CREATE.getCode());
-                    List<Map> salesOrders = baseMapper.queryAll(orderQuery);
-                    //相同订单号
-                    if(salesOrders.size() > 0) {
-                         List<Map> salesOrderList = salesOrders.stream().filter(m -> mpsSaleOrder.getSale_code().equals(m.get("sale_code")) && mpsSaleOrder.getMaterial_code().equals(m.get("material_code"))).collect(Collectors.toList());
-                         if(salesOrderList.size() > 0) {
-                              continue;
-                         }
-                         else{
-                              Map maxSeqNoOrder = salesOrders.stream().max(Comparator.comparingInt(m -> (int) m.get("seq_no"))).orElse(null);
-                              int maxSeqNoValue = (int) maxSeqNoOrder.get("seq_no");
-                              mpsSaleOrder.setSeq_no(maxSeqNoValue + 100);
+                         OrderQuery orderQuery = new OrderQuery();
+                         orderQuery.setSale_code(mpsSaleOrder.getSale_code());
+                         orderQuery.setStatus(SaleOrderEnum.CREATE.getCode());
+                         List<Map> salesOrders = baseMapper.queryAll(orderQuery);
+                         //相同订单号
+                         if(salesOrders.size() > 0) {
+                              List<Map> salesOrderList = salesOrders.stream().filter(m -> mpsSaleOrder.getSale_code().equals(m.get("sale_code")) && mpsSaleOrder.getMaterial_code().equals(m.get("material_code"))).collect(Collectors.toList());
+                              if(salesOrderList.size() > 0) {
+                                   continue;
+                              }
+                              else{
+                                   Map maxSeqNoOrder = salesOrders.stream().max(Comparator.comparingInt(m -> (int) m.get("seq_no"))).orElse(null);
+                                   int maxSeqNoValue = (int) maxSeqNoOrder.get("seq_no");
+                                   mpsSaleOrder.setSeq_no(maxSeqNoValue + 100);
+                              }
                          }
+                         mpsSaleOrder.setAps_sale_code(mpsSaleOrder.getSale_code() + "-" + mpsSaleOrder.getSeq_no());
                     }
-                    mpsSaleOrder.setAps_sale_code(mpsSaleOrder.getSale_code() + "-" + mpsSaleOrder.getSeq_no());
                     if(CollectionUtils.isEmpty(errorMap)) {
                          if(mpsSaleOrder.getSale_code() != null) {
                               data.add(mpsSaleOrder);
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs_manage/controller/purchase/PcsIfPurchaseorderController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs_manage/controller/purchase/PcsIfPurchaseorderController.java
index 3a35659b..5883257d 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs_manage/controller/purchase/PcsIfPurchaseorderController.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs_manage/controller/purchase/PcsIfPurchaseorderController.java
@@ -1,5 +1,6 @@
 package org.nl.wms.pcs_manage.controller.purchase;
 
+import cn.dev33.satoken.annotation.SaIgnore;
 import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSONObject;
 import org.nl.common.anno.Log;
@@ -46,6 +47,14 @@ public class PcsIfPurchaseorderController{
           return new ResponseEntity<>(purchaseorderService.queryRawIn(query, page), HttpStatus.OK);
      }
 
+//     @GetMapping(value = "/queryApt")
+//     @SaIgnore
+//     @Log("测试")
+//     public String queryApt() {
+//          String result="{\n" + "    \"Msg_DisplayState\":{\n" + "        \"AGV_ID\":255,\n" + "        \"Auto_In_Line_State\":0,\n" + "        \"Bosch_Car_Global_Theta\":-90.19221757272916,\n" + "        \"Bosch_Car_Global_rx\":-1.0619603784858553,\n" + "        \"Bosch_Car_Global_ry\":0.0020978358374357303,\n" + "        \"Bosch_Loc_State\":-2,\n" + "        \"Bosch_No_Rec_State\":0,\n" + "        \"Bosch_raw_age\":0.01389455795288086,\n" + "        \"Bosch_raw_epoch\":1,\n" + "        \"Bosch_raw_locState\":-2,\n" + "        \"Bosch_raw_qw\":0.9999999908132869,\n" + "        \"Bosch_raw_qx\":0,\n" + "        \"Bosch_raw_qy\":0,\n" + "        \"Bosch_raw_qz\":0.00013554861104682667,\n" + "        \"Bosch_raw_timestamp\":1695633231.1093392,\n" + "        \"Bosch_raw_uniqueId\":0,\n" + "        \"Bosch_raw_x\":0.0008994877773440588,\n" + "        \"Bosch_raw_x_odo\":0.0008994877773440588,\n" + "        \"Bosch_raw_y\":0.0006906610801896382,\n" + "        \"Bosch_raw_y_odo\":0.0006906610801896382,\n" + "        \"Bosch_raw_yaw\":0.00027109722292381746,\n" + "        \"Bosch_raw_yaw_odo\":0.0006906610801896382,\n" + "        \"Bosch_raw_z\":0,\n" + "        \"CAD_Or_TCS_Ctrl\":0,\n" + "        \"Car_Global_Theta\":-90.19221757272916,\n" + "        \"Car_Global_rx\":-1.0619603784858553,\n" + "        \"Car_Global_ry\":0.0020978358374357303,\n" + "        \"CurNodeID\":0,\n" + "        \"Cur_Stop_Info1_Authorized_Pass\":1,\n" + "        \"Cur_Stop_Info1_High_Precious_Enable\":1,\n" + "        \"Cur_Stop_Info1_Reached_Stop\":0,\n" + "        \"Cur_Stop_Info1_Set_Patht\":0,\n" + "        \"Cur_Stop_Info1_Set_Pathx\":0,\n" + "        \"Cur_Stop_Info1_Set_Pathy\":0,\n" + "        \"Cur_Stop_Info1_Single_Request_Sch\":0,\n" + "        \"Cur_Stop_Info1_Single_Stop_Sch\":0,\n" + "        \"Cur_Stop_Info1_StopEndNode\":0,\n" + "        \"Cur_Stop_Info1_StopStartNode\":0,\n" + "        \"Cur_Stop_Info1_Stop_Endt\":0,\n" + "        \"Cur_Stop_Info1_Stop_Endx\":0,\n" + "        \"Cur_Stop_Info1_Stop_Endy\":0,\n" + "        \"Cur_Stop_Info1_Stop_Num\":0,\n" + "        \"Cur_Stop_Info2_Authorized_Pass\":1,\n" + "        \"Cur_Stop_Info2_High_Precious_Enable\":1,\n" + "        \"Cur_Stop_Info2_Reached_Stop\":0,\n" + "        \"Cur_Stop_Info2_Set_Patht\":0,\n" + "        \"Cur_Stop_Info2_Set_Pathx\":0,\n" + "        \"Cur_Stop_Info2_Set_Pathy\":0,\n" + "        \"Cur_Stop_Info2_Single_Request_Sch\":0,\n" + "        \"Cur_Stop_Info2_Single_Stop_Sch\":0,\n" + "        \"Cur_Stop_Info2_StopEndNode\":0,\n" + "        \"Cur_Stop_Info2_StopStartNode\":0,\n" + "        \"Cur_Stop_Info2_Stop_Endt\":0,\n" + "        \"Cur_Stop_Info2_Stop_Endx\":0,\n" + "        \"Cur_Stop_Info2_Stop_Endy\":0,\n" + "        \"Cur_Stop_Info2_Stop_Num\":0,\n" + "        \"Curtis_Warning_Code_Pump\":0,\n" + "        \"Curtis_Warning_Code_Speed\":82,\n" + "        \"Curtis_Warning_Code_Steer\":0,\n" + "        \"EndNode\":0,\n" + "        \"Env_CustomName\":\"NobleLift\",\n" + "        \"Env_HMIUseJavaApp\":\"true\",\n" + "        \"Env_LearnEnable\":\"true\",\n" + "        \"Env_Lu_ROS_IP2\":\"\",\n" + "        \"Env_SoftwareVersion\":\"[Version]Magic4.1[Info]2023_09_21_20_41_37_Lu_ROS_magic4_waypointab_v31\",\n" + "        \"Env_VehicleType\":\"PS10LMT_HuaHai\",\n" + "        \"Get_Nav350_Curr_Layer\":0,\n" + "        \"Language\":1022739087,\n" + "        \"LastAltitudeExpectValue_mm\":0,\n" + "        \"LastGantryXExpectValue_mm\":0,\n" + "        \"LastGantryYExpectValue_mm\":0,\n" + "        \"Lateral_Deviation_m\":119.00021121312,\n" + "        \"License_Info\":\"EC060800FFFBEBBF 6B7685747EBC EC060800FFFBEBBF 6B7685747EBC 2021/8/26 13:46:47 2021/8/26 13:46:47 1 UserClass5 Magic4_1\",\n" + "        \"LindeAgwSteerCenterPivotPlateAng\":0,\n" + "        \"LindeAgwSteerErrorFlag\":0,\n" + "        \"LindeAgwSteerModeSelectorState\":0,\n" + "        \"LindeAgwTracLiftErrorFlag\":0,\n" + "        \"LindeAgwTracLiftModeSelectorState\":0,\n" + "        \"LindeDriveErrCode1\":0,\n" + "        \"LindeDriveErrCode2\":0,\n" + "        \"LindeDriveErrCode3\":0,\n" + "        \"LindeDriveErrCode4\":0,\n" + "        \"LindeLiftErrCode1\":0,\n" + "        \"LindeLiftErrCode2\":0,\n" + "        \"LindeLiftErrCode3\":0,\n" + "        \"LindeLiftErrCode4\":0,\n" + "        \"LindeSteerErrCode1\":0,\n" + "        \"LindeSteerErrCode2\":0,\n" + "        \"LindeSteerErrCode3\":0,\n" + "        \"LindeSteerErrCode4\":0,\n" + "        \"Login_Info\":\"\",\n" + "        \"Min_Dist\":0,\n" + "        \"MissionCompleteAltitude_mm_RemoteOrHMI_FB\":0,\n" + "        \"MissionCompleteGantryX_mm_RemoteOrHMI_FB\":0,\n" + "        \"MissionCompleteGantryY_mm_RemoteOrHMI_FB\":0,\n" + "        \"Navi_Method\":3,\n" + "        \"ObstacleDetectState\":0,\n" + "        \"ObstacleTouchState\":0,\n" + "        \"Out_Of_Path_Times\":0,\n" + "        \"PFC_Sch\":0,\n" + "        \"PFC_State\":\"[PathFollow_Control_Handle_WLANJSON][PathFollow_Schedule_WLANJSON=0]\\n\",\n" + "        \"PLC_Warning_Code\":0,\n" + "        \"PWR_Percent\":100,\n" + "        \"PWR_Warn\":0,\n" + "        \"PathFollow_Enable\":0,\n" + "        \"PathFollow_Expect_AltitudeCtrlEnable\":0,\n" + "        \"PathFollow_Expect_GantryXCtrlEnable\":0,\n" + "        \"PathFollow_Expect_GantryYCtrlEnable\":0,\n" + "        \"Plate_Check_Err_Code\":0,\n" + "        \"ReachState\":0,\n" + "        \"RealAutoChargeState\":0,\n" + "        \"Ref_std_rt\":0,\n" + "        \"Ref_std_rx\":0,\n" + "        \"Ref_std_ry\":0,\n" + "        \"Remote_Or_HMI_Ctrl\":1,\n" + "        \"SVreal_angle\":55,\n" + "        \"Sche_JSON_Sche_Enable\":0,\n" + "        \"Speedm_Tmp\":11,\n" + "        \"StartNode\":0,\n" + "        \"Sub_Warning_Code0\":0,\n" + "        \"Sys_Mode\":4,\n" + "        \"Task_Sch\":0,\n" + "        \"Task_State\":\"\",\n" + "        \"Update_Sch\":0,\n" + "        \"Update_State\":\"\",\n" + "        \"VehicleCtrlExpThrottle\":222,\n" + "        \"VehicleCtrlRealAltitude_mm\":998,\n" + "        \"VehicleCtrlRealCustomStateByte0\":0,\n" + "        \"VehicleCtrlRealCustomStateByte1\":0,\n" + "        \"VehicleCtrlRealCustomStateByte2\":0,\n" + "        \"VehicleCtrlRealCustomStateByte3\":0,\n" + "        \"VehicleCtrlRealGantryX_mm\":0,\n" + "        \"VehicleCtrlRealGantryY_mm\":0,\n" + "        \"VehicleCtrlRealJoyEnable\":0,\n" + "        \"VehicleCtrlRealRCEnable\":0,\n" + "        \"VehicleCtrl_CAN_Err_Info\":0,\n" + "        \"Vertical_Deviation_deg\":0.232222321,\n" + "        \"Warning_Code\":20971522,\n" + "        \"header\":{\n" + "            \"frame_id\":\"\",\n" + "            \"seq\":1904,\n" + "            \"stamp\":{\n" + "                \"nsec\":160948865,\n" + "                \"sec\":1695633231\n" + "            }\n" + "        }\n" + "    }\n" + "}";
+//          return result;
+//     }
+
      @GetMapping
      @Log("原料计划分页查询")
      public ResponseEntity<Object> pageQuery(PurchaseOrderQuery query, PageQuery page) {
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs_manage/service/purchase/dao/PcsIfPurchaseorder.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs_manage/service/purchase/dao/PcsIfPurchaseorder.java
index a7f606d4..3c8224fe 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs_manage/service/purchase/dao/PcsIfPurchaseorder.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs_manage/service/purchase/dao/PcsIfPurchaseorder.java
@@ -1,15 +1,10 @@
 package org.nl.wms.pcs_manage.service.purchase.dao;
-
 import java.math.BigDecimal;
-
 import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import java.io.Serializable;
 import java.util.Date;
-
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
diff --git a/mes/qd/src/views/wms/pcs/purchaseorder/index.vue b/mes/qd/src/views/wms/pcs/purchaseorder/index.vue
index 14fd4621..cf3c0af6 100644
--- a/mes/qd/src/views/wms/pcs/purchaseorder/index.vue
+++ b/mes/qd/src/views/wms/pcs/purchaseorder/index.vue
@@ -103,7 +103,7 @@
         <el-table-column label="车间" prop="workshop_id" show-overflow-tooltip/>
         <el-table-column label="物料编号" prop="material_code" show-overflow-tooltip width="130"/>
         <el-table-column :min-width="flexWidth('material_name', crud.data, '物料名称')" label="物料名称" prop="material_name" show-overflow-tooltip/>
-        <el-table-column :min-width="flexWidth('ask_time', crud.data, '要求到货日期')" label="要求到货日期" prop="askTime"/>
+        <el-table-column label="要求到货日期" prop="askTime" show-overflow-tooltip width="150"/>
         <el-table-column label="重量" min-width="120" prop="show_qty" show-overflow-tooltip/>
         <!--        <el-table-column show-overflow-tooltip min-width="120" prop="biz_date" label="安全库存" />-->
         <!--        <el-table-column label="总重量" align="center" prop="total_qty"/>-->
diff --git a/mes/qd/src/views/wms/pcs/purchaseplan/index.vue b/mes/qd/src/views/wms/pcs/purchaseplan/index.vue
index 37857e8f..5f489ab7 100644
--- a/mes/qd/src/views/wms/pcs/purchaseplan/index.vue
+++ b/mes/qd/src/views/wms/pcs/purchaseplan/index.vue
@@ -151,7 +151,7 @@
         <el-table-column :formatter="workshopFormat" label="车间" prop="workshop_id" show-overflow-tooltip/>
         <el-table-column label="物料编号" prop="material_code" show-overflow-tooltip width="130"/>
         <el-table-column label="物料名称" prop="material_name" show-overflow-tooltip width="130"/>
-        <el-table-column label="要求到货日期" prop="askTime" show-overflow-tooltip width="130"/>
+        <el-table-column label="要求到货日期" prop="askTime" show-overflow-tooltip width="150"/>
         <el-table-column label="重量" min-width="120" prop="show_qty" show-overflow-tooltip/>
         <el-table-column label="确认交货日期" min-width="120" prop="agree_time" show-overflow-tooltip/>
         <el-table-column label="订单编号" min-width="120" prop="po_code" show-overflow-tooltip/>
diff --git a/mes/qd/src/views/wms/pcs/saleorder/Dialog.vue b/mes/qd/src/views/wms/pcs/saleorder/Dialog.vue
index 4a8e04d7..0915d596 100644
--- a/mes/qd/src/views/wms/pcs/saleorder/Dialog.vue
+++ b/mes/qd/src/views/wms/pcs/saleorder/Dialog.vue
@@ -1,18 +1,18 @@
 <template>
   <el-dialog
-    title="aps提交"
-    append-to-body
-    :visible.sync="dialogVisible"
-    destroy-on-close
-    :show-close="true"
-    width="500px"
     v-loading.fullscreen.lock="fullscreenLoading"
+    :show-close="true"
+    :visible.sync="dialogVisible"
+    append-to-body
+    destroy-on-close
+    title="aps提交"
+    width="500px"
     @close="close"
   >
     <div class="head-container">
       <div>
         <!-- 搜索 -->
-        <el-form ref="form" :model="form1" :rules="rules" size="mini" label-width="110px">
+        <el-form ref="form" :model="form1" :rules="rules" label-width="110px" size="mini">
 
 
           <el-form-item label="订单阶段:" prop="bill_code">
@@ -22,13 +22,13 @@
             </el-select>
           </el-form-item>
 
-          <el-form-item label="日期区间：" prop="createTime">
+          <el-form-item label="订单交期：" prop="createTime">
             <el-date-picker
               v-model="form.createTime"
+              end-placeholder="结束日期"
+              start-placeholder="开始日期"
               type="daterange"
               value-format="yyyy-MM-dd"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
             />
           </el-form-item>
 
@@ -39,7 +39,7 @@
 
 
         </el-form>
-        <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="queryStruct">确认
+        <el-button class="filter-item" icon="el-icon-search" size="mini" type="success" @click="queryStruct">确认
         </el-button>
       </div>
     </div>
@@ -89,7 +89,7 @@ export default {
     queryStruct() {
       // 校验开始日期和结束日期是否为空
       if (!this.form.createTime || !this.form.createTime[0] || !this.form.createTime[1]) {
-        this.showErrorNotification('请选择日期区间')
+        this.showErrorNotification('请选择订单交期')
         return
       }
       // 校验销售订单号值是否为空
diff --git a/mes/qd/src/views/wms/pcs/saleorder/index.vue b/mes/qd/src/views/wms/pcs/saleorder/index.vue
index 82ba7ad5..0576b87e 100644
--- a/mes/qd/src/views/wms/pcs/saleorder/index.vue
+++ b/mes/qd/src/views/wms/pcs/saleorder/index.vue
@@ -8,46 +8,91 @@
           :inline="true"
           class="demo-form-inline"
           label-position="right"
-          label-width="80px"
           label-suffix=":"
+          label-width="80px"
         >
           <el-form-item label="销售单号">
             <el-input
               v-model="query.sale_code"
+              class="filter-item"
               clearable
               placeholder="销售单号"
               style="width: 200px;"
-              class="filter-item"
             />
           </el-form-item>
           <el-form-item label="物料搜索">
             <el-input
               v-model="query.material"
-              clearable
-              size="small"
-              placeholder="物料编码、名称或规格"
-              style="width: 200px;"
               class="filter-item"
+              clearable
+              placeholder="物料编码、名称或规格"
+              size="small"
+              style="width: 200px;"
+            />
+          </el-form-item>
+          <el-form-item label="订单交期">
+            <el-date-picker
+              v-model="query.planTime"
+              :default-time="['00:00:00', '23:59:59']"
+              end-placeholder="结束日期"
+              start-placeholder="开始日期"
+              type="daterange"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              @change="crud.toQuery"
             />
           </el-form-item>
           <el-form-item label="创建时间">
             <el-date-picker
               v-model="query.createTime"
+              :default-time="['00:00:00', '23:59:59']"
+              end-placeholder="结束日期"
+              start-placeholder="开始日期"
               type="daterange"
               value-format="yyyy-MM-dd HH:mm:ss"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
-              :default-time="['00:00:00', '23:59:59']"
               @change="crud.toQuery"
             />
+            <el-form-item label="单据类型">
+              <el-select
+                v-model="query.sale_type"
+                clearable
+                filterable
+                placeholder="请选择"
+                style="width: 200px"
+                @change="crud.toQuery"
+              >
+                <el-option
+                  v-for="item in dict.PCS_SAL_TYPE"
+                  :key="item.id"
+                  :label="item.label"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-form-item>
+          <el-form-item label="生成方式">
+            <el-select
+              v-model="query.create_mode"
+              clearable
+              filterable
+              placeholder="请选择"
+              style="width: 200px"
+              @change="crud.toQuery"
+            >
+              <el-option
+                v-for="item in dict.ST_CREATE_MODE"
+                :key="item.id"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
           </el-form-item>
           <el-form-item label="状态">
             <el-select
               v-model="query.status"
-              style="width: 200px"
               clearable
               filterable
               placeholder="请选择"
+              style="width: 200px"
               @change="crud.toQuery"
             >
               <el-option
@@ -58,24 +103,24 @@
               />
             </el-select>
           </el-form-item>
-          <el-form-item label="产品系列">
-            <treeselect
-              v-model="query.product_series"
-              :options="classes3"
-              :auto-load-root-options="false"
-              :load-options="loadChildNodes"
-              style="width: 200px;"
-              placeholder="请选择"
-            />
-          </el-form-item>
+          <!--          <el-form-item label="产品系列">-->
+          <!--            <treeselect-->
+          <!--              v-model="query.product_series"-->
+          <!--              :auto-load-root-options="false"-->
+          <!--              :load-options="loadChildNodes"-->
+          <!--              :options="classes3"-->
+          <!--              placeholder="请选择"-->
+          <!--              style="width: 200px;"-->
+          <!--            />-->
+          <!--          </el-form-item>-->
           <rrOperation :crud="crud"/>
         </el-form>
         <el-button
           slot="right"
           class="filter-item"
-          type="success"
           icon="el-icon-position"
           size="mini"
+          type="success"
           @click="deleteApsData"
         >
           清空测试数据
@@ -86,9 +131,9 @@
         <el-button
           slot="right"
           class="filter-item"
-          type="warning"
           icon="el-icon-upload2"
           size="mini"
+          type="warning"
           @click="uploadShow = true"
         >
           导入
@@ -97,9 +142,9 @@
         <el-button
           slot="right"
           class="filter-item"
-          type="success"
           icon="el-icon-position"
           size="mini"
+          type="success"
           @click="importin"
         >
           aps提交
@@ -107,10 +152,10 @@
       </crudOperation>
       <!--表单组件-->
       <el-dialog
-        :close-on-click-modal="false"
         :before-close="crud.cancelCU"
-        :visible.sync="crud.status.cu > 0"
+        :close-on-click-modal="false"
         :title="crud.status.title"
+        :visible.sync="crud.status.cu > 0"
         width="1200px"
       >
         <el-form
@@ -122,8 +167,9 @@
         >
           <el-form-item label="车间" prop="product_area">
             <!-- unit_list-->
-            <el-select v-model="form.product_area" :disabled="crud.status.edit > 0 || crud.status.view > 0"
-                       placeholder=""
+            <el-select
+              v-model="form.product_area" :disabled="crud.status.edit > 0 || crud.status.view > 0"
+              placeholder=""
             >
               <el-option
                 v-for="item in dict.product_area"
@@ -134,13 +180,15 @@
             </el-select>
           </el-form-item>
           <el-form-item label="销售单号" prop="sale_code">
-            <el-input v-model="form.sale_code" :disabled="crud.status.edit > 0 || crud.status.view > 0"
-                      style="width: 200px;"
+            <el-input
+              v-model="form.sale_code" :disabled="crud.status.edit > 0 || crud.status.view > 0"
+              style="width: 200px;"
             />
           </el-form-item>
           <el-form-item label="合同号" prop="contract_code">
-            <el-input v-model="form.contract_code" :disabled="crud.status.edit > 0 || crud.status.view > 0"
-                      style="width: 200px;"
+            <el-input
+              v-model="form.contract_code" :disabled="crud.status.edit > 0 || crud.status.view > 0"
+              style="width: 200px;"
             />
           </el-form-item>
           <!-- <el-form-item label="计量单位" prop="unit_name">
@@ -154,8 +202,9 @@
             </el-select>
           </el-form-item> -->
           <el-form-item label="物料编码" prop="material_code">
-            <el-input v-model="form.material_code" :disabled="crud.status.edit > 0 || crud.status.view > 0"
-                      style="width: 200px;"
+            <el-input
+              v-model="form.material_code" :disabled="crud.status.edit > 0 || crud.status.view > 0"
+              style="width: 200px;"
             />
           </el-form-item>
           <!-- <el-form-item label="客户名称" prop="cust_name">
@@ -171,9 +220,9 @@
           <el-form-item label="计划交期时间" prop="plandeliver_date">
             <el-date-picker
               v-model="form.plandeliverDate"
-              value-format="yyyy-MM-dd"
-              type="date"
               style="width: 200px;"
+              type="date"
+              value-format="yyyy-MM-dd"
             />
             <el-form-item label="订单数量" prop="sale_qty">
               <el-input-number v-model="form.sale_qty" style="width: 200px;"/>
@@ -204,76 +253,95 @@
       >
         <el-table-column type="selection" width="55"/>
         <el-table-column
-          prop="sale_code"
           label="销售单号"
           min-width="100"
+          prop="sale_code"
           show-overflow-tooltip
         />
         <el-table-column
+          label="行号"
+          min-width="60"
           prop="seq_no"
-          label="销售单行号"
-          min-width="100"
           show-overflow-tooltip
         />
         <!-- <el-table-column prop="seq_no" label="明细序号" /> -->
 
-        <el-table-column prop="contract_code" label="合同号"
-                         :min-width="flexWidth('contract_code', crud.data, '合同号')"
-        />
-
-        <el-table-column prop="material_code" label="物料编码"
-                         :min-width="flexWidth('material_code', crud.data, '物料编码')"
+        <el-table-column
+          :min-width="flexWidth('contract_code', crud.data, '合同号')" label="合同号"
+          prop="contract_code"
+        />
+
+        <el-table-column
+          :min-width="flexWidth('material_code', crud.data, '物料编码')" label="物料编码"
+          prop="material_code"
         />
 
         <el-table-column
-          prop="material_spec"
-          label="物料规格"
           :min-width="flexWidth('material_spec', crud.data, '物料规格')"
+          label="物料规格"
+          prop="material_spec"
         />
 
-        <el-table-column
-          prop="material_name"
-          label="物料名称"
-          :min-width="flexWidth('material_name', crud.data, '物料名称')"
-          show-overflow-tooltip
-        />
+        <!--        <el-table-column-->
+        <!--          :min-width="flexWidth('material_name', crud.data, '物料名称')"-->
+        <!--          label="物料名称"-->
+        <!--          prop="material_name"-->
+        <!--          show-overflow-tooltip-->
+        <!--        />-->
 
-        <el-table-column prop="product_area" label="工段">
+        <el-table-column label="工段" prop="product_area">
           <template slot-scope="scope">
             {{ dict.label.product_area[scope.row.product_area] }}
           </template>
         </el-table-column>
-
-        <el-table-column prop="sale_qty" label="订单数量"/>
+        <el-table-column label="订单数量" min-width="80" prop="sale_qty"/>
+        <el-table-column label="需生产数量" min-width="88" prop="need_product_qty"/>
+        <el-table-column label="已生产数量" min-width="88" prop="product_qty"/>
+        <el-table-column label="刻字数量" prop="lettering_qty"/>
+        <el-table-column label="预入库数量" min-width="88" prop="instor_qty"/>
+        <el-table-column label="入库数量" prop="in_storage_qty"/>
+        <el-table-column label="发货数量" prop="sendout_qty"/>
 
         <el-table-column
-          prop="qty_unit_name"
-          label="计量单位"
-          show-overflow-tooltip
-          min-width="80"
-        />
-        <el-table-column
-          prop="plandeliverDate"
-          label="前段计划交期"
+          label="预入库交期"
           min-width="100"
+          prop="warehousing_date"
           show-overflow-tooltip
         />
-        <el-table-column prop="status" label="前段状态">
+        <el-table-column
+          label="计划交期"
+          min-width="100"
+          prop="plandeliverDate"
+          show-overflow-tooltip
+        />
+        <el-table-column
+          label="订单交期"
+          min-width="100"
+          prop="order_date"
+          show-overflow-tooltip
+        />
+        <el-table-column label="订单状态" prop="status">
           <template slot-scope="scope">
             {{ dict.label.PCS_SALE_STATUS[scope.row.status] }}
           </template>
         </el-table-column>
         <el-table-column
-          prop="behindPlandeliverDate"
-          label="后段计划交期"
-          min-width="100"
+          label="计量单位"
+          min-width="80"
+          prop="qty_unit_name"
           show-overflow-tooltip
         />
-        <el-table-column prop="behind_submit_flag" label="后段状态">
-          <template slot-scope="scope">
-            {{ dict.label.PCS_SALE_STATUS[scope.row.behind_submit_flag] }}
-          </template>
-        </el-table-column>
+        <!--        <el-table-column-->
+        <!--          label="后段计划交期"-->
+        <!--          min-width="100"-->
+        <!--          prop="behindPlandeliverDate"-->
+        <!--          show-overflow-tooltip-->
+        <!--        />-->
+        <!--        <el-table-column label="后段状态" prop="behind_submit_flag">-->
+        <!--          <template slot-scope="scope">-->
+        <!--            {{ dict.label.PCS_SALE_STATUS[scope.row.behind_submit_flag] }}-->
+        <!--          </template>-->
+        <!--        </el-table-column>-->
 
         <el-table-column
           prop="rawmaterial_name"
@@ -282,9 +350,9 @@
           show-overflow-tooltip
         />
         <el-table-column
-          prop="rate_qty"
-          label="单重"
           :min-width="flexWidth('rate_qty', crud.data, '单重')"
+          label="单重"
+          prop="rate_qty"
           show-overflow-tooltip
         />
         <el-table-column
@@ -292,6 +360,7 @@
           label="原辅料库存"
           :min-width="flexWidth('canuse_qty', crud.data, '原辅料库存')"
           show-overflow-tooltip
+          width="90"
         />
         <!--        <el-table-column-->
         <!--          prop="early_start_time"-->
@@ -300,38 +369,34 @@
         <!--          show-overflow-tooltip-->
         <!--        />-->
         <el-table-column
-          prop="product_qty"
-          label="生产数量"
-          :min-width="flexWidth('product_qty', crud.data, '生产数量')"
-          show-overflow-tooltip
-        />
-        <el-table-column
-          prop="sale_type"
           label="销售单类型"
           min-width="100"
+          prop="sale_type"
           show-overflow-tooltip
         >
           <template slot-scope="scope">
             {{ dict.label.PCS_SAL_TYPE[scope.row.sale_type] }}
           </template>
         </el-table-column>
-        <el-table-column prop="create_mode" label="生成方式" min-width="100">
+        <el-table-column label="生成方式" min-width="100" prop="create_mode">
           <template slot-scope="scope">
             {{ dict.label.ST_CREATE_MODE[scope.row.create_mode] }}
           </template>
         </el-table-column>
-        <el-table-column prop="create_name" label="创建人"/>
+        <el-table-column label="创建人" prop="create_name"/>
         <el-table-column
-          prop="createTime"
-          label="创建时间"
           :min-width="flexWidth('createTime', crud.data, '创建时间')"
-        />
-        <el-table-column prop="update_time" label="修改时间"
-                         :min-width="flexWidth('update_time',crud.data,'修改时间')"
+          label="创建时间"
+          prop="createTime"
+        />
+        <el-table-column
+          :min-width="flexWidth('update_time',crud.data,'修改时间')" label="修改时间"
+          prop="update_time"
         />
         <el-table-column
-          prop="remark"
           label="备注"
+          min-width="200"
+          prop="remark"
           show-overflow-tooltip
           min-width="200"
         />
@@ -358,7 +423,7 @@
 <script>
 import crudSaleOrder from '@/views/wms/pcs/saleorder/saleOrder'
 import customerbase from '@/api/wms/basedata/master/customerbase'
-import CRUD, { presenter, header, form, crud } from '@crud/crud'
+import CRUD, { crud, form, header, presenter } from '@crud/crud'
 import rrOperation from '@crud/RR.operation'
 import crudOperation from '@crud/CRUD.operation'
 import UploadDialog from '@/views/wms/pcs/saleorder/UploadDialog'