From 583e9cb6d7830fcbda866c37db5824378c807418 Mon Sep 17 00:00:00 2001
From: mengjiao <3338049200@qq,com>
Date: Tue, 20 Aug 2024 16:09:31 +0800
Subject: [PATCH] =?UTF-8?q?=E6=88=90=E5=93=81=E4=BF=AE=E6=94=B9--=E5=8F=88?=
 =?UTF-8?q?=E4=B8=8D=E6=83=B3=E5=9C=A8=E6=88=90=E5=93=81=E4=B8=8B=E7=BA=BF?=
 =?UTF-8?q?=E7=9A=84=E6=97=B6=E5=80=99=E7=BB=91=E6=89=98=E7=9B=98=EF=BC=8C?=
 =?UTF-8?q?--=E8=AE=A9=E6=A0=87=E8=AF=86=E5=8D=A1=E4=BB=A3=E6=9B=BF?=
 =?UTF-8?q?=E6=89=98=E7=9B=98=E7=A0=81=EF=BC=8C=E5=A6=82=E6=9E=9C=E6=B2=A1?=
 =?UTF-8?q?=E6=9C=89=E7=BB=91=E7=9A=84=E8=AF=9D=EF=BC=8C=E5=B0=B1=E6=A0=87?=
 =?UTF-8?q?=E8=AF=86=E5=8D=A1=E4=BB=A3=E6=9B=BF=E6=89=98=E7=9B=98=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wms/service/impl/WmsProductPutServiceImpl.java  | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsProductPutServiceImpl.java b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsProductPutServiceImpl.java
index 0ff95244..288d346a 100644
--- a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsProductPutServiceImpl.java
+++ b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsProductPutServiceImpl.java
@@ -1068,7 +1068,18 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService {
                  wmsProductPut1.setRemark("0");//未入库
              }
         }else {
-            return  null;
+            //他们又不想在成品下线的时候绑托盘，--让标识卡代替托盘码，如果没有绑的话，就标识卡代替托盘码
+            wmsProductPut1.setSn(wmsProductPut.getPallet());
+            WmsProductPutRecords    wmsProductPutRecords=new    WmsProductPutRecords();
+            wmsProductPutRecords.setUserDefined1(wmsProductPut.getPallet());
+            List<WmsProductPutRecords>  wmsProductPutRecords1=    wmsProductPutRecordsMapper.selectWmsProductPutRecordsList(wmsProductPutRecords);
+            if(wmsProductPutRecords1.size()>0){
+                wmsProductPut1.setRemark("1");//已经入库
+                wmsProductPut1.setNumber(wmsProductPutRecords1.get(0).getNumber());
+            }else {
+                wmsProductPut1.setRemark("0");//未入库
+            }
+//            return  null;
         }
         if (wmsProductPut1.getAttr3()==null){
             wmsProductPut1.setAttr3(wmsProductPut1.getPlanQuantity().toString());