root/wms1.0
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add:增加合格证字段及服务器层

Browse Source
This commit is contained in:
zhangzq
2024-11-27 13:14:03 +08:00
parent 09f1d20a85
commit c791f86e84
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/iostorage/PdaInController.java
View File

@@ -50,7 +50,7 @@ public class PdaInController {
@Log("单据入库组盘确认") @Log("单据入库组盘确认")
public ResponseEntity<TableDataInfo> confirm(@RequestBody PdaFormInMst pdaFormInMst) { public ResponseEntity<TableDataInfo> confirm(@RequestBody PdaFormInMst pdaFormInMst) {
RedissonUtils.lock(() -> { RedissonUtils.lock(() -> {
pdaInIOService.pdaInIostorUseCode(pdaFormInMst);
}, pdaFormInMst.getBillNo(), null); }, pdaFormInMst.getBillNo(), null);
return new ResponseEntity<>(TableDataInfo.build(), HttpStatus.OK); return new ResponseEntity<>(TableDataInfo.build(), HttpStatus.OK);
} }

15
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/iostorage/sevice/PdaInIOService.java
View File

@@ -14,6 +14,7 @@ import org.nl.wms.config_manage.form_struc.service.IBmFormStrucService;
import org.nl.wms.config_manage.form_struc.service.dao.BmFormStruc; import org.nl.wms.config_manage.form_struc.service.dao.BmFormStruc;
import org.nl.wms.external_system.erp.dto.ErpQuery; import org.nl.wms.external_system.erp.dto.ErpQuery;
import org.nl.wms.external_system.erp.dto.ErpSec; import org.nl.wms.external_system.erp.dto.ErpSec;
import org.nl.wms.pda_manage.iostorage.server.dto.PdaFormInMst;
import org.nl.wms.pda_manage.iostorage.server.dto.PdaFormOutDtl; import org.nl.wms.pda_manage.iostorage.server.dto.PdaFormOutDtl;
import org.nl.wms.pda_manage.iostorage.server.dto.PdaFormOutMst; import org.nl.wms.pda_manage.iostorage.server.dto.PdaFormOutMst;
import org.nl.wms.pm_manage.form_data.service.dao.PmFormData; import org.nl.wms.pm_manage.form_data.service.dao.PmFormData;
@@ -45,13 +46,13 @@ public class PdaInIOService {
IStIvtIostorinvdtlService iStIvtIostorinvdtlService; IStIvtIostorinvdtlService iStIvtIostorinvdtlService;
public void pdaInIostorUseCode(PdaFormOutMst pdaFormOutMst) { public void pdaInIostorUseCode(PdaFormInMst pdaFormInMst) {
PdaInIOService ioService = SpringContextHolder.getBean(PdaInIOService.class); // PdaInIOService ioService = SpringContextHolder.getBean(PdaInIOService.class);
//创建单据分配货位 // //创建单据分配货位
StIvtIostorinv ivtIostorinv = ioService.createPadIvtAndoutDispense(pdaFormOutMst); // StIvtIostorinv ivtIostorinv = ioService.createPadIvtAndoutDispense(pdaFormOutMst);
StIvtIostorinv byId = iStIvtIostorinvService.getById(ivtIostorinv.getId()); // StIvtIostorinv byId = iStIvtIostorinvService.getById(ivtIostorinv.getId());
//生成流程 // //生成流程
this.pdaTaskOpen(byId); // this.pdaTaskOpen(byId);
} }
@Transactional @Transactional