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 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());