From 7cce8479958012bfc8ed66af30438499c00fd992 Mon Sep 17 00:00:00 2001
From: "[li_she]" <[li.she@xujiesoft.com]>
Date: Tue, 7 Dec 2021 09:09:09 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E5=AE=A2=E6=88=B7=E7=BC=96?=
 =?UTF-8?q?=E7=A0=81=20=E6=94=B9=E4=B8=BA=E4=BB=8E=E8=A7=86=E5=9B=BE?=
 =?UTF-8?q?=E8=8E=B7=E5=8F=96=20sxm=202021-12-7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/SoReceiveBoxesServiceImpl.java       |  3 +-
 .../mapper/finishedProduct/PackingDao.xml     |  4 +--
 .../static/pda/js/productwarehouse/storage.js | 28 ++++++++-----------
 3 files changed, 14 insertions(+), 21 deletions(-)

diff --git a/src/main/java/com/gaotao/modules/finishedProduct/service/impl/SoReceiveBoxesServiceImpl.java b/src/main/java/com/gaotao/modules/finishedProduct/service/impl/SoReceiveBoxesServiceImpl.java
index a5e3508..2a6071f 100644
--- a/src/main/java/com/gaotao/modules/finishedProduct/service/impl/SoReceiveBoxesServiceImpl.java
+++ b/src/main/java/com/gaotao/modules/finishedProduct/service/impl/SoReceiveBoxesServiceImpl.java
@@ -110,7 +110,7 @@ public class SoReceiveBoxesServiceImpl extends ServiceImpl<SoReceiveBoxesDao, So
         // 获取箱号
         receiveBoxRollsEntity.setBoxNo(soReceiveBoxesEntity.getBoxNo());
         SoReceiveBoxRollsEntity lastRoll = soReceiveBoxRollsService.boxLastRoll(receiveBoxRollsEntity);
-        // 1.1.2 判断卷在该箱中 的生产日期是不是最晚的;
+        // 1.1.2 判断卷在该箱中 的生产日期是不是最晚的
         if (!receiveBoxRollsEntity.getFinalRollNo().equals(lastRoll.getFinalRollNo())){
             throw new RuntimeException("请先移除该箱中卷生产日期最早得卷: "+lastRoll.getFinalRollNo());
         }
@@ -123,7 +123,6 @@ public class SoReceiveBoxesServiceImpl extends ServiceImpl<SoReceiveBoxesDao, So
         SoReceiveBoxRollsEntity removeBoxRollsEntity = new SoReceiveBoxRollsEntity();
         removeBoxRollsEntity.setBoxNo(soReceiveBoxesEntity.getBoxNo());
         List<SoReceiveBoxRollsEntity> soReceiveBoxRollsEntityList = this.baseMapper.searchBoxRolls(removeBoxRollsEntity);
-
         if (soReceiveBoxRollsEntityList.size() == 0) {
             remove(new QueryWrapper<SoReceiveBoxesEntity>().eq("box_no", soReceiveBoxesEntity.getBoxNo()));
         } else {
diff --git a/src/main/resources/mapper/finishedProduct/PackingDao.xml b/src/main/resources/mapper/finishedProduct/PackingDao.xml
index b463fbd..a583c99 100644
--- a/src/main/resources/mapper/finishedProduct/PackingDao.xml
+++ b/src/main/resources/mapper/finishedProduct/PackingDao.xml
@@ -37,9 +37,7 @@
         </where>
     </select>
     <select id="getCustomerId" resultType="java.lang.String">
-        SELECT ConfigurationTemplateID
-        FROM part
-        WHERE PartNo = #{partNo}
+        select top 1 客户编码 from view_Print_ROll_Label_1  where 物料编码 = #{partNo}
     </select>
     <select id="getMPNByPartNo" resultType="java.lang.String">
         select MPN
diff --git a/src/main/resources/static/pda/js/productwarehouse/storage.js b/src/main/resources/static/pda/js/productwarehouse/storage.js
index ac667f0..a106094 100644
--- a/src/main/resources/static/pda/js/productwarehouse/storage.js
+++ b/src/main/resources/static/pda/js/productwarehouse/storage.js
@@ -8,7 +8,7 @@ function getPartName(partNo) {
         data: JSON.stringify(part),
         dataType: "json",
         beforeSend: function (request) {
-             request.setRequestHeader("token", $.cookie("token"));
+            request.setRequestHeader("token", $.cookie("token"));
         },
         success: function (data) {
             if (data.data) {
@@ -29,9 +29,9 @@ function getPartName(partNo) {
 }
 
 // 更据卷号获取料号
-function getPartNo(rollno){
+function getPartNo(rollno) {
     var roll = {
-        rollno:rollno
+        rollno: rollno
     }
     $.ajax({
         url: "/finishedProduct/crollinfo/getPartByRollno",
@@ -40,13 +40,13 @@ function getPartNo(rollno){
         data: JSON.stringify(roll),
         dataType: "json",
         beforeSend: function (request) {
-             request.setRequestHeader("token", $.cookie("token"));
+            request.setRequestHeader("token", $.cookie("token"));
         },
         success: function (data) {
-            if (data.cRollinfo){
+            if (data.cRollinfo) {
                 $("#partNo").val(data.cRollinfo.partno)
                 $("#partName").val(data.cRollinfo.partDescription)
-            }else {
+            } else {
                 layer.msg('该卷不存在')
                 $("#partNo").val('')
                 $("#partName").val('')
@@ -92,11 +92,9 @@ $("#rollNo").bind("keydown", function (event) {
 //校验仓库编号是否存在
 function getWareHouse() {
     var warehouseId = $("#warehouseId").val()
-
     var warehouse = {
         warehouseid: warehouseId
     }
-
     $.ajax({
         url: "/warehouse/getWarehouse",
         contentType: 'application/json',
@@ -104,7 +102,7 @@ function getWareHouse() {
         data: JSON.stringify(warehouse),
         dataType: "json",
         beforeSend: function (request) {
-             request.setRequestHeader("token", $.cookie("token"));
+            request.setRequestHeader("token", $.cookie("token"));
         },
         success: function (data) {
             if (data.data.warehouse) {
@@ -127,7 +125,6 @@ function submitToStorage() {
     var rollNumber = $("#rollNumber").val()
     var warehouseId = $("#warehouseId").val()
     var display = $("#display").val()
-
     let saveRollStorage = {
         partNo: $("#partNo").val(),
         storageNumber: $("#storageNumber").val(),
@@ -163,7 +160,7 @@ function submitToStorage() {
         data: JSON.stringify(saveRollStorage),
         dataType: "json",
         beforeSend: function (request) {
-             request.setRequestHeader("token", $.cookie("token"));
+            request.setRequestHeader("token", $.cookie("token"));
         },
         success: function (data) {
             if (data.code == 0) {
@@ -171,7 +168,6 @@ function submitToStorage() {
                 $("#rollNo").val('');
                 $("#storageNumber").val('')
                 $("#rollNumber").val('')
-                $("#warehouseId").val('')
                 $("#display").val('')
                 $("#partName").val('')
                 layer.msg('入库成功')
@@ -186,7 +182,7 @@ function submitToStorage() {
                     $("#roll_table").append(str);
                 })
                 print(data.inRollList)
-            }else {
+            } else {
                 layer.msg('入库失败')
             }
             if (data.code == 401) {
@@ -202,7 +198,7 @@ function submitToStorage() {
 
 
 // 打印卷标签
-function print(val){
+function print(val) {
     var rollPrintList = val
     if (rollPrintList.length <= 0) {
         return;
@@ -214,7 +210,7 @@ function print(val){
         data: JSON.stringify(rollPrintList),
         dataType: "json",
         beforeSend: function (request) {
-             request.setRequestHeader("token", $.cookie("token"));
+            request.setRequestHeader("token", $.cookie("token"));
         },
         success: function (data) {
             rollList = []
@@ -222,7 +218,7 @@ function print(val){
                 layer.msg("打印成功")
                 rollPrintList = []
             }
-            if (data.code == 500){
+            if (data.code == 500) {
                 layer.msg(data.msg)
             }
             if (data.code == 401) {