diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/controller/api/WmsPdaApiController.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/controller/api/WmsPdaApiController.java index 7010e41d..af642428 100644 --- a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/controller/api/WmsPdaApiController.java +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/controller/api/WmsPdaApiController.java @@ -4,6 +4,7 @@ import lombok.RequiredArgsConstructor; import org.dromara.common.core.domain.R; import org.dromara.common.web.core.BaseController; import org.dromara.wms.domain.*; +import org.dromara.wms.domain.bo.WmsAllocateTaskBo; import org.dromara.wms.domain.bo.WmsInstockPrintBo; import org.dromara.wms.domain.bo.WmsMoveOrderBo; import org.dromara.wms.domain.bo.WmsReturnOrderBo; @@ -530,6 +531,12 @@ public class WmsPdaApiController extends BaseController { private R allocateinSubmit(@RequestBody WmsAllocateTaskVo vo) { // List list = wmsAllocateTaskService.allocateSelectCode(code); // return list == null ? R.fail() : R.ok(list.get(0)); + WmsAllocateTaskBo bo=new WmsAllocateTaskBo(); + bo.setAllocateTaskId(vo.getAllocateTaskId()); + bo.setInboundStatus("1"); + bo.setUpdateTime(new Date()); + wmsAllocateTaskService.updateByBo(bo); + apiService.allocateinSubmitInsertRecord(vo); return R.ok(); } diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/vo/WmsAllocateTaskVo.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/vo/WmsAllocateTaskVo.java index 6ebf7af0..aa3db7fa 100644 --- a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/vo/WmsAllocateTaskVo.java +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/vo/WmsAllocateTaskVo.java @@ -123,5 +123,6 @@ public class WmsAllocateTaskVo implements Serializable { @ExcelProperty(value = "子表id") private Long aoDId; - + private String instockQty;//入库数量 + private String locationCode;//入库金额 } diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/IWmsPdaApiService.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/IWmsPdaApiService.java index 71688552..a6539ca3 100644 --- a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/IWmsPdaApiService.java +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/IWmsPdaApiService.java @@ -83,4 +83,6 @@ public interface IWmsPdaApiService { String selectInstoreRecordLocaltionCode(Long materialId); WmsInventory outAllocateSelectInVentory(WmsOutstockRecord outstockRecord); + + Boolean allocateinSubmitInsertRecord(WmsAllocateTaskVo vo); } diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsPdaApiServiceImpl.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsPdaApiServiceImpl.java index 4ea9464c..8696c6b2 100644 --- a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsPdaApiServiceImpl.java +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsPdaApiServiceImpl.java @@ -614,4 +614,13 @@ public class WmsPdaApiServiceImpl implements IWmsPdaApiService { public String selectInstoreRecordLocaltionCode(Long materialId) { return apiMapper.selectInstoreRecordLocaltionCode(materialId); } + + @Override + public Boolean allocateinSubmitInsertRecord(WmsAllocateTaskVo vo) { + WmsInstockRecord record = new WmsInstockRecord(); + BeanUtils.copyProperties(vo, record); + record.setSpecialType("1"); + record.setInstockQty(Double.valueOf(vo.getInstockQty())); + return wmsInstockRecordMapper.insert(record) > 0; + } }