diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storagecheck/StorageCheckServiceImpl.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storagecheck/StorageCheckServiceImpl.java index 6f1d915..0fadb21 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storagecheck/StorageCheckServiceImpl.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storagecheck/StorageCheckServiceImpl.java @@ -157,7 +157,7 @@ public class StorageCheckServiceImpl implements StorageCheckService { storageDO.setStockInType(stockInType); storageDO.setStockNo(UUID.fastUUID().toString(true)); storageDO.setHeaderNo(storageCheckDO.getStockNo()); - storageDO.setStatus(1); + storageDO.setDescription(storageCheckDO.getDescription()); storageDO.setWhId(storageCheckDO.getWhId()); storageDO.setKeeper(storageCheckDO.getKeeper()); @@ -165,8 +165,11 @@ public class StorageCheckServiceImpl implements StorageCheckService { storageDO.setOutbound(storageCheckDO.getKeeper()); storageDO.setOutboundTime(current); storageDO.setDescription("由盘点单号"+storageCheckDO.getStockNo()+"提交产生"); - - + if(stockType == 1){ + storageDO.setStatus(2); + }else{ + storageDO.setStatus(4); + } storageMapper.insert(storageDO); storageDO.setStockNo(STOCK_IN.getCode(storageDO.getId().toString())); storageMapper.updateById(storageDO); @@ -221,7 +224,7 @@ public class StorageCheckServiceImpl implements StorageCheckService { } } } - + storageMapper.deleteById(storageDO.getId()); } private void saveStorageMat(StorageCheckDO storageCheckDO, Long stockId, Integer stockType){ diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/storagelog/printDialog.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/storagelog/printDialog.vue index a015caa..a7b7ade 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/heli/storagelog/printDialog.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/storagelog/printDialog.vue @@ -24,7 +24,7 @@