diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/impl/SectattrServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/impl/SectattrServiceImpl.java index 99284b3..723faa7 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/impl/SectattrServiceImpl.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/impl/SectattrServiceImpl.java @@ -180,6 +180,7 @@ public class SectattrServiceImpl extends ServiceImpl i List sectattrList = sectattrMapper.selectList(new LambdaQueryWrapper<>(Sectattr.class) .select(Sectattr::getSect_id,Sectattr::getSect_name) + .ne(Sectattr::getSect_type_attr,"09") .eq(StrUtil.isNotEmpty(stor_jo.getStor_id()),Sectattr::getStor_id,stor_jo.getStor_id()) .eq(StrUtil.isNotEmpty(sect_type_attr),Sectattr::getSect_type_attr,sect_type_attr) .eq(Sectattr::getIs_delete,BaseDataEnum.IS_YES_NOT.code("否")) diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/AcsTaskDto.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/AcsTaskDto.java index 652b419..6450ead 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/AcsTaskDto.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/AcsTaskDto.java @@ -21,6 +21,7 @@ public class AcsTaskDto { */ private String task_code; + private String floor_code; /** * 取货点1 diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/StOutTask.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/StOutTask.java index 5f4117b..fc99d69 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/StOutTask.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/StOutTask.java @@ -69,6 +69,8 @@ public class StOutTask extends AbstractTask { AcsTaskDto acsTaskDto = new AcsTaskDto(); acsTaskDto.setExt_task_uuid(taskDao.getTask_id()); acsTaskDto.setTask_code(taskDao.getTask_code()); + JSONObject param = JSONObject.parseObject(taskDao.getRequest_param()); + acsTaskDto.setFloor_code(param.getString("floor_code")); acsTaskDto.setStart_device_code(taskDao.getPoint_code1()); acsTaskDto.setNext_device_code(taskDao.getPoint_code2()); if (taskDao.getPoint_code2().contains("-")) { diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/dao/IOStorInvDis.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/dao/IOStorInvDis.java index b2975a8..9c0a2aa 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/dao/IOStorInvDis.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/dao/IOStorInvDis.java @@ -128,4 +128,6 @@ public class IOStorInvDis implements Serializable { */ private String point_code; + private String floor_code; + } diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/impl/OutBillServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/impl/OutBillServiceImpl.java index 0014e3f..df7fe68 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/impl/OutBillServiceImpl.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/impl/OutBillServiceImpl.java @@ -446,7 +446,7 @@ public class OutBillServiceImpl extends ServiceImpl i ioStorInvDisMapper.insert(ioStorInvDis); allocation_canuse_qty = allocation_canuse_qty.add(outAllocation.getFrozen_qty()); //分配完成 结束分配 - unassign_qty=unassign_qty.subtract(allocation_canuse_qty); + unassign_qty=unassign_qty.subtract(outAllocation.getFrozen_qty()); if (unassign_qty.doubleValue() <= 0){ break; } @@ -577,6 +577,7 @@ public class OutBillServiceImpl extends ServiceImpl i } for (int i = 0; i < dtls.size(); i++) { IOStorInvDtlDto dtl = dtls.get(i); + //未分配数 BigDecimal unassign_qty = dtl.getUnassign_qty(); String pcsn = dtl.getPcsn(); String material_id = dtl.getMaterial_id(); @@ -591,7 +592,7 @@ public class OutBillServiceImpl extends ServiceImpl i .build() ); int seq_no = 1; - BigDecimal allocation_canuse_qty=BigDecimal.ZERO; + BigDecimal allocation_canuse_qty = BigDecimal.ZERO; for (StrategyStructMaterialVO outAllocation : structMaterials) { //分配明细 IOStorInvDis ioStorInvDis = new IOStorInvDis(); @@ -632,6 +633,7 @@ public class OutBillServiceImpl extends ServiceImpl i //生成分配明细 ioStorInvDisMapper.insert(ioStorInvDis); allocation_canuse_qty = allocation_canuse_qty.add(outAllocation.getFrozen_qty()); + unassign_qty = unassign_qty.subtract(outAllocation.getFrozen_qty()); //分配完成 结束分配 if (unassign_qty.doubleValue() <= 0){ break; @@ -946,10 +948,13 @@ public class OutBillServiceImpl extends ServiceImpl i public void allSetPoint(JSONObject whereJson) { //出库点 String point_code = whereJson.getString("point_code"); - + String floor_code = whereJson.getString("floor_code"); if (StrUtil.isBlank(point_code)){ throw new BadRequestException("未选择出库点"); } + if (StrUtil.isBlank(floor_code)){ + throw new BadRequestException("未选择楼层"); + } String iostorinv_id = whereJson.getString("iostorinv_id"); //查询主表信息 @@ -974,6 +979,7 @@ public class OutBillServiceImpl extends ServiceImpl i task_form.put("TaskCode",CodeUtil.getNewCode("TASK_CODE")); task_form.put("PickingLocation", ioStorInvDis.getStruct_code()); task_form.put("PlacedLocation", point_code); + task_form.put("floor_code",floor_code); task_form.put("vehicle_code", ioStorInvDis.getStoragevehicle_code()); StOutTask stOutTask = SpringContextHolder.getBean("STOutTask"); @@ -987,6 +993,7 @@ public class OutBillServiceImpl extends ServiceImpl i dis.setTask_id(task_id); dis.setIs_issued(BaseDataEnum.IS_YES_NOT.code("是")); dis.setPoint_code(point_code); + dis.setFloor_code(floor_code); ioStorInvDisMapper.updateById(dis); } } diff --git a/nladmin-ui/src/views/wms/st/outbill/DivDialog.vue b/nladmin-ui/src/views/wms/st/outbill/DivDialog.vue index 9132716..ba50dc4 100644 --- a/nladmin-ui/src/views/wms/st/outbill/DivDialog.vue +++ b/nladmin-ui/src/views/wms/st/outbill/DivDialog.vue @@ -172,6 +172,22 @@ /> + + + + + @@ -220,6 +236,7 @@ + @@ -237,7 +254,7 @@ export default { name: 'DivDialog', components: { StructIvt }, mixins: [crud()], - dicts: ['io_bill_status', 'work_status'], + dicts: ['io_bill_status', 'work_status', 'floor_code'], props: { dialogShow: { type: Boolean, @@ -281,7 +298,8 @@ export default { form2: { unassign_qty: '0', assign_qty: '0', - point_code: '' + point_code: '', + floor_code: '' }, sects: [], pointList: [], @@ -444,9 +462,14 @@ export default { this.crud.notify('请先选择站点！', CRUD.NOTIFICATION_TYPE.INFO) return } + if (this.form2.floor_code === '') { + this.crud.notify('请先选择楼层！', CRUD.NOTIFICATION_TYPE.INFO) + return + } this.loadingSetAllPoint = true const data = { 'point_code': this.form2.point_code, + 'floor_code': this.form2.floor_code, 'iostorinv_id': this.mstrow.iostorinv_id, 'bill_code': this.mstrow.bill_code, 'checked': this.checked diff --git a/nladmin-ui/src/views/wms/st/outbill/ViewDialog.vue b/nladmin-ui/src/views/wms/st/outbill/ViewDialog.vue index b630343..e52e274 100644 --- a/nladmin-ui/src/views/wms/st/outbill/ViewDialog.vue +++ b/nladmin-ui/src/views/wms/st/outbill/ViewDialog.vue @@ -158,7 +158,8 @@ - + +