Merge remote-tracking branch 'origin/smf-core-21088' into smf-core-21088

src/main/java/com/neotel/smfcore/custom/luxsan/factory_c/rawstor/controller/manual/ManualGrPutInController.java

@@ -237,6 +237,8 @@ public class ManualGrPutInController {
         //判断是否为禁用料
         barcode = smfApi.canPutInAfterResolve(barcode);
 
+        barcode.setWarehouseCode(warhouseCode);
+
         //判断隔口能否放入
         if (boxBarcode != null){
 
@@ -249,8 +251,8 @@ public class ManualGrPutInController {
                 barcode.setProduceDate(grDate);
                 barcode.setLabelId(cell.getLABEL_ID());
                 barcode.setPosName(binCode);
-                barcode.setWarehouseCode(warhouseCode);
                 barcode.setBarSource(grCode);
+                barcode.setWarehouseCode(warhouseCode);
                 barcode.setSeq(BoxHandleUtil.getSeq(boxBarcode,binCode)+1);
                 barcode.setPutInTime(System.currentTimeMillis());
                 // 刷新缓存中gr已过帐数量, 如果超出数量则报错