diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/IStructattrService.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/IStructattrService.java index 977392b..2631f3e 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/IStructattrService.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/IStructattrService.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; import org.nl.common.domain.query.PageQuery; import org.nl.wms.basedata_manage.service.dao.Structattr; +import org.nl.wms.warehouse_management.service.dao.IOStorInv; import org.springframework.data.domain.Pageable; import java.util.List; @@ -82,6 +83,8 @@ public interface IStructattrService extends IService { */ void changeActive(JSONObject json); + void updateStatusByCode(String operate, JSONObject JSONObject); + /** * 更新锁状态 * @param updateAttrList { diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/impl/StructattrServiceImpl.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/impl/StructattrServiceImpl.java index 95dbe26..89ff540 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/impl/StructattrServiceImpl.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/impl/StructattrServiceImpl.java @@ -7,6 +7,8 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -24,6 +26,7 @@ import org.nl.wms.basedata_manage.service.dao.BsrealStorattr; import org.nl.wms.basedata_manage.service.dao.Sectattr; import org.nl.wms.basedata_manage.service.dao.Structattr; import org.nl.wms.basedata_manage.service.dao.mapper.StructattrMapper; +import org.nl.wms.warehouse_management.service.dao.IOStorInv; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -226,6 +229,37 @@ public class StructattrServiceImpl extends ServiceImpl(Structattr.class) + .set(Structattr::getInv_id,jsonObject.getString("inv_id")) + .set(Structattr::getInv_code,jsonObject.getString("inv_code")) + .set(Structattr::getInv_type,jsonObject.getString("inv_type")) + .set(Structattr::getLock_type,"01") + .eq(Structattr::getStruct_code,jsonObject.getString("struct_code")) + ); + break; + case "1": + + break; + + case "2": + //解锁仓位 + this.update(new LambdaUpdateWrapper<>(Structattr.class) + .set(Structattr::getInv_id,jsonObject.getString("inv_id")) + .set(Structattr::getInv_code,jsonObject.getString("inv_code")) + .set(Structattr::getInv_type,jsonObject.getString("inv_type")) + .set(Structattr::getLock_type,"00") + .eq(Structattr::getStruct_code,jsonObject.getString("struct_code")) + ); + break; + } + } + @Override public void updateLock(List updateAttrList) { List attrList = this.list( diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/StInTask.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/StInTask.java index de4fe6d..f081199 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/StInTask.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/StInTask.java @@ -36,7 +36,8 @@ public class StInTask extends AbstractTask { task.setConfig_code(json.getString("task_type")); task.setPoint_code1(json.getString("PickingLocation")); task.setPoint_code2(json.getString("PlacedLocation")); - task.setExt_group_data(json.getString("CarryIsEmptyTuoPan")); + task.setVehicle_code(json.getString("vehicle_code")); + task.setGroup_id(json.getString("group_id")); task.setRequest_param(json.toString()); task.setPriority(json.getString("Priority")); task.setCreate_id(SecurityUtils.getCurrentUserId()); diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/IOStorInv.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/IOStorInv.java index 44bc014..758de7b 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/IOStorInv.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/IOStorInv.java @@ -95,7 +95,7 @@ public class IOStorInv implements Serializable { private Integer detail_count; /** - * 单据状态 + * 单据状态 10生成 20分配中 30分配完 99完成 */ private String bill_status; diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/IOStorInvDtl.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/IOStorInvDtl.java index 46b1d49..eae2115 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/IOStorInvDtl.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/IOStorInvDtl.java @@ -28,77 +28,77 @@ public class IOStorInvDtl implements Serializable { private String iostorinv_id; /** - * 出入单标识 + * 明细序号 */ private String seq_no; /** - * 出入单标识 + * 物料标识 */ private String material_id; /** - * 出入单标识 + * 批次 */ private String pcsn; /** - * 出入单标识 + * 单据明细状态 10生成 20分配中 30分配完 99完成 */ private String bill_status; /** - * 出入单标识 + * 数量计量单位标识 */ private String qty_unit_id; /** - * 出入单标识 + * 数量计量单位名称 */ private String qty_unit_name; /** - * 出入单标识 + * 计划数量 */ private BigDecimal plan_qty; /** - * 出入单标识 + * 实际数量 */ private BigDecimal real_qty; /** - * 出入单标识 + * 来源单据明细标识 */ private String source_billdtl_id; /** - * 出入单标识 + * 来源单据类型 */ private String source_bill_type; /** - * 出入单标识 + * 来源单编号 */ private String source_bill_code; /** - * 出入单标识 + * 来源单表名 */ private String source_bill_table; /** - * 出入单标识 + * 备注 */ private String remark; /** - * 出入单标识 + * 已分配数量 */ private BigDecimal assign_qty; /** - * 出入单标识 + * 未分配数量 */ private BigDecimal unassign_qty; } diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/mapper/IOStorInvDisMapper.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/mapper/IOStorInvDisMapper.java index 74fd4b5..102cfbf 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/mapper/IOStorInvDisMapper.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/mapper/IOStorInvDisMapper.java @@ -15,5 +15,5 @@ import java.util.List; @Mapper public interface IOStorInvDisMapper extends BaseMapper { - List queryInBillDisDtlByIosId(@Param("iostorinv_id")String iostorinv_id); + List queryInBillDisDtlByIosId(@Param("iostorinvdtl_id")String iostorinvdtl_id); } diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/mapper/IOStorInvDisMapper.xml b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/mapper/IOStorInvDisMapper.xml index 97a1b49..c7c4a82 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/mapper/IOStorInvDisMapper.xml +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/mapper/IOStorInvDisMapper.xml @@ -12,9 +12,9 @@ LEFT JOIN md_me_materialbase mb ON mb.material_id = dis.material_id where (dis.task_id is null OR dis.task_id = '') - + AND - dis.iostorinv_id = #{iostorinv_id} + dis.iostorinvdtl_id = #{iostorinvdtl_id} diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/impl/RawAssistIStorServiceImpl.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/impl/RawAssistIStorServiceImpl.java index 70f4776..83b7268 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/impl/RawAssistIStorServiceImpl.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/impl/RawAssistIStorServiceImpl.java @@ -8,6 +8,7 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -16,6 +17,7 @@ import org.nl.common.exception.BadRequestException; import org.nl.common.utils.CodeUtil; import org.nl.common.utils.IdUtil; import org.nl.common.utils.SecurityUtils; +import org.nl.config.SpringContextHolder; import org.nl.system.service.param.impl.SysParamServiceImpl; import org.nl.wms.basedata_manage.service.IBsrealStorattrService; import org.nl.wms.basedata_manage.service.IStructattrService; @@ -23,6 +25,10 @@ import org.nl.wms.basedata_manage.service.dao.BsrealStorattr; import org.nl.wms.basedata_manage.service.dao.MdPbStoragevehicleinfo; import org.nl.wms.basedata_manage.service.dao.Structattr; import org.nl.wms.basedata_manage.service.dao.mapper.MdPbStoragevehicleinfoMapper; +import org.nl.wms.sch_manage.service.dao.SchBasePoint; +import org.nl.wms.sch_manage.service.dao.mapper.SchBasePointMapper; +import org.nl.wms.sch_manage.service.util.AbstractTask; +import org.nl.wms.sch_manage.service.util.tasks.StInTask; import org.nl.wms.warehouse_management.service.IRawAssistIStorService; import org.nl.wms.warehouse_management.service.dao.GroupPlate; import org.nl.wms.warehouse_management.service.dao.IOStorInv; @@ -69,6 +75,9 @@ public class RawAssistIStorServiceImpl extends ServiceImpl map = rows.get(0); - //判断该载具是否已经分配货位或者起点 + //判断该分配明细是否已经分配货位 IOStorInvDis ioStorInvDis = ioStorInvDisMapper.selectOne(new LambdaQueryWrapper<>(IOStorInvDis.class) .eq(IOStorInvDis::getIostorinvdis_id,map.get("iostorinvdis_id")) - .isNull(IOStorInvDis::getStruct_code)); + .isNull(IOStorInvDis::getStruct_code).or().eq(IOStorInvDis::getStruct_code,"")); if (ObjectUtil.isEmpty(ioStorInvDis)){ throw new BadRequestException("该明细已经分配过货位，无法继续分配！"); } - String point_code = map.get("point_code"); -// if (StrUtil.isNotEmpty(point_code)) { -// HashMap point_map = new HashMap<>(); -// PointDto pointDto = pointService.findByCode(point_code); -// point_map.put("point_code", pointDto.getPoint_code()); -// point_map.put("point_id", pointDto.getPoint_id() + ""); -// point_map.put("point_name", pointDto.getPoint_name()); -// WQLObject.getWQLObject("ST_IVT_IOStorInvDis").update(point_map, "iostorinv_id = '" + map.get("iostorinv_id") + "' AND box_no = '" + map.get("box_no") + "'"); -// } - Boolean checked = whereJson2.getBoolean("checked"); - //是否分配货位 + //是否自动分配仓位 if (ObjectUtil.isNotEmpty(checked) && checked) { JSONObject jo_form = new JSONObject(); Structattr struct = new Structattr(); @@ -433,33 +431,6 @@ public class RawAssistIStorServiceImpl extends ServiceImpl jsonAttr.getDoubleValue("height")) { -// throw new BadRequestException("木箱高度不符，请检查!"); -// } -// } else if (StrUtil.equals(jsonAttr.getString("layer_num"), "1")) { -// if (box_high > Double.parseDouble(in_download_box_high)) { -// throw new BadRequestException("木箱高度不符，请检查!"); -// } -// } -// } -// -// if (box_high > Double.parseDouble(in_up_box_high)) { -// throw new BadRequestException("木箱高度不符，请检查!"); -// } - sect_id = map.get("sect_id"); sect_code = map.get("sect_code"); sect_name = map.get("sect_name"); @@ -467,7 +438,7 @@ public class RawAssistIStorServiceImpl extends ServiceImpl dis_map = new HashMap(); + JSONObject dis_map = new JSONObject(); dis_map.put("sect_id", sect_id); dis_map.put("sect_code", sect_code); dis_map.put("sect_name", sect_name); @@ -476,107 +447,43 @@ public class RawAssistIStorServiceImpl extends ServiceImpl(IOStorInvDis.class) + .set(IOStorInvDis::getSect_id,dis_map.getString("sect_id")) + .set(IOStorInvDis::getSect_code,dis_map.getString("sect_code")) + .set(IOStorInvDis::getSect_name,dis_map.getString("sect_name")) + .set(IOStorInvDis::getStruct_id,dis_map.getString("struct_id")) + .set(IOStorInvDis::getStruct_code,dis_map.getString("struct_code")) + .set(IOStorInvDis::getStruct_name,dis_map.getString("struct_name")) + .eq(IOStorInvDis::getIostorinvdis_id,map.get("iostorinvdis_id")) + ); + + //维护单据明细表里 分配数量 + JSONObject jsonObject = new JSONObject(); + jsonObject.put("iostorinvdtl_id",map.get("iostorinvdtl_id")); + jsonObject.put("bill_status","30"); + jsonObject.put("assign_qty",map.get("plan_qty")); + jsonObject.put("unassign_qty","0"); + ioStorInvDtlMapper.updateById(jsonObject.toJavaObject(IOStorInvDtl.class)); + + //根据单据标识判断分配明细是否都已经分配完成 + int disCount = ioStorInvDisMapper.selectCount(new LambdaQueryWrapper<>(IOStorInvDis.class) + .eq(IOStorInvDis::getIostorinv_id,map.get("iostorinv_id")) + .isNull(IOStorInvDis::getStruct_code).or().eq(IOStorInvDis::getStruct_code,"")); + + // 根据分配货位情况 更新主表单据状态 + IOStorInv ios = new IOStorInv(); + ios.setIostorinv_id(map.get("iostorinv_id")); + ios.setBill_status(disCount>0 ? "20" : "30"); + ioStorInvMapper.updateById(ios); } @Override @@ -585,13 +492,89 @@ public class RawAssistIStorServiceImpl extends ServiceImpl rows = (ArrayList) whereJson.get("tableMater"); + HashMap jo = rows.get(0); + + //解锁原货位点位 + JSONObject unlock_map = new JSONObject(); + unlock_map.put("struct_code", jo.get("struct_code")); + unlock_map.put("inv_type", null); + unlock_map.put("inv_id", null); + unlock_map.put("inv_code", null); + iStructattrService.updateStatusByCode("2",unlock_map); + + // 修改分配明细表 + ioStorInvDisMapper.update(new IOStorInvDis(),new LambdaUpdateWrapper<>(IOStorInvDis.class) + .set(IOStorInvDis::getSect_id,null) + .set(IOStorInvDis::getSect_code,null) + .set(IOStorInvDis::getSect_name,null) + .set(IOStorInvDis::getStruct_id,null) + .set(IOStorInvDis::getStruct_code,null) + .set(IOStorInvDis::getStruct_name,null) + .eq(IOStorInvDis::getIostorinvdis_id,jo.get("iostorinvdis_id")) + ); + + //维护单据明细表里 分配数量 + JSONObject jsonObject = new JSONObject(); + jsonObject.put("iostorinvdtl_id",jo.get("iostorinvdtl_id")); + jsonObject.put("bill_status","10"); + jsonObject.put("assign_qty","0"); + jsonObject.put("unassign_qty",jo.get("plan_qty")); + ioStorInvDtlMapper.updateById(jsonObject.toJavaObject(IOStorInvDtl.class)); + + //根据单据标识判断分配明细是否都已经分配完成 + int disCount = ioStorInvDisMapper.selectCount(new LambdaQueryWrapper<>(IOStorInvDis.class) + .eq(IOStorInvDis::getIostorinv_id,jo.get("iostorinv_id")) + .isNotNull(IOStorInvDis::getStruct_code).or().ne(IOStorInvDis::getStruct_code,"")); + + // 根据分配货位情况 更新主表单据状态 + IOStorInv ios = new IOStorInv(); + ios.setIostorinv_id(jo.get("iostorinv_id")); + ios.setBill_status(disCount>0 ? "20" : "10"); + ioStorInvMapper.updateById(ios); } @Override + @Transactional(rollbackFor = Exception.class) public void divPoint(Map whereJson) { + ArrayList rows = (ArrayList) whereJson.get("tableMater"); + String point_code = (String) whereJson.get("point_code"); + HashMap map = rows.get(0); + + //判断是否已经分配好货位 + IOStorInvDis ioStorInvDis = ioStorInvDisMapper.selectOne(new LambdaQueryWrapper<>(IOStorInvDis.class) + .eq(IOStorInvDis::getIostorinvdis_id,map.get("iostorinvdis_id")) + .isNotNull(IOStorInvDis::getStruct_code).or().ne(IOStorInvDis::getStruct_code,"")); + if (ObjectUtil.isEmpty(ioStorInvDis)){ + throw new BadRequestException("该明细还没分配货位，请先分配货位"); + } + + //创建任务 + JSONObject task_form = new JSONObject(); + task_form.put("task_type", "STInTask"); + task_form.put("TaskCode",CodeUtil.getNewCode("TASK_CODE")); + task_form.put("PickingLocation", point_code); + task_form.put("PlacedLocation", ioStorInvDis.getStruct_code()); + task_form.put("vehicle_code", map.get("storagevehicle_code")); + GroupPlate groupPlate = groupPlateMapper.selectOne(new LambdaQueryWrapper<>(GroupPlate.class) + .eq(GroupPlate::getStoragevehicle_code,map.get("storagevehicle_code")) + ); + task_form.put("group_id", groupPlate.getGroup_id()); + StInTask stInTask = SpringContextHolder.getBean("STInTask"); + + String task_id = stInTask.create(task_form); + + //分配明细表更新任务相关数据 + IOStorInvDis dis = new IOStorInvDis(); + dis.setIostorinvdis_id(map.get("iostorinvdis_id")); + dis.setWork_status("01"); + dis.setTask_id(task_id); + dis.setPoint_code(point_code); + ioStorInvDisMapper.updateById(dis); } @Override @@ -620,7 +603,31 @@ public class RawAssistIStorServiceImpl extends ServiceImpl(IOStorInv.class) + .eq(IOStorInv::getIostorinv_id,whereJson.get("iostorinv_id")) + ); + + if (ObjectUtil.isNotEmpty(ioStorInv) && !"20".equals(ioStorInv.getBill_status()) && !"30".equals(ioStorInv.getBill_status())){ + throw new BadRequestException("主表状态必须为分配中、分配完！"); + } + + // 分配明细中 任务状态必须全部完成 + int count = ioStorInvDisMapper.selectCount(new LambdaQueryWrapper<>(IOStorInvDis.class) + .eq(IOStorInvDis::getIostorinv_id,whereJson.get("iostorinv_id")) + .lt(IOStorInvDis::getWork_status,"99") + ); + if (count > 0){ + throw new BadRequestException("存在未完成的作业"); + } + + //将明细全部变成99 + ioStorInvDtlMapper.update(new IOStorInvDtl(),new LambdaUpdateWrapper<>(IOStorInvDtl.class) + .set(IOStorInvDtl::getBill_status,"99") + .eq(IOStorInvDtl::getIostorinv_id,whereJson.get("iostorinv_id")) + ); + } @@ -632,8 +639,8 @@ public class RawAssistIStorServiceImpl extends ServiceImpl getDisDtl(Map whereJson) { //查询该明细下的所有入库分配载具明细 - String iostorinv_id = (String) whereJson.get("iostorinv_id"); - return ioStorInvDisMapper.queryInBillDisDtlByIosId(iostorinv_id); + String iostorinvdtl_id = (String) whereJson.get("iostorinvdtl_id"); + return ioStorInvDisMapper.queryInBillDisDtlByIosId(iostorinvdtl_id); } @Override @@ -645,25 +652,25 @@ public class RawAssistIStorServiceImpl extends ServiceImpl structattrList = iStructattrService.list(new LambdaQueryWrapper<>(Structattr.class) .eq(Structattr::getSect_id,sect_id) .eq(Structattr::getLock_type,"00") ); - MdPbStoragevehicleinfo mdPbStoragevehicleinfo = mdPbStoragevehicleinfoMapper.selectOne(new LambdaQueryWrapper<>(MdPbStoragevehicleinfo.class) - .eq(MdPbStoragevehicleinfo::getStoragevehicle_code,storagevehicle_code) - ); if (ObjectUtil.isEmpty(structattrList)){ throw new BadRequestException("该库区没有仓位"); } + MdPbStoragevehicleinfo mdPbStoragevehicleinfo = mdPbStoragevehicleinfoMapper.selectOne(new LambdaQueryWrapper<>(MdPbStoragevehicleinfo.class) + .eq(MdPbStoragevehicleinfo::getStoragevehicle_code,storagevehicle_code) + ); if (ObjectUtil.isEmpty(mdPbStoragevehicleinfo)){ throw new BadRequestException("没有该载具号信息"); } // 过滤掉不满足载具长宽高的仓位 Structattr structattr = structattrList.stream().filter(st -> - st.getWidth().compareTo(mdPbStoragevehicleinfo.getVehicle_width()) <0 && - st.getHeight().compareTo(mdPbStoragevehicleinfo.getVehicle_height()) <0 && - st.getZdepth().compareTo(mdPbStoragevehicleinfo.getVehicle_long()) <0 + st.getWidth().compareTo(mdPbStoragevehicleinfo.getVehicle_width()) >=0 && + st.getHeight().compareTo(mdPbStoragevehicleinfo.getVehicle_height()) >=0 && + st.getZdepth().compareTo(mdPbStoragevehicleinfo.getVehicle_long()) >=0 ).findAny().get(); if (ObjectUtil.isEmpty(structattr)){ diff --git a/wms/nladmin-ui/src/views/wms/st/inbill/DivDialog.vue b/wms/nladmin-ui/src/views/wms/st/inbill/DivDialog.vue index 83011fd..45eac05 100644 --- a/wms/nladmin-ui/src/views/wms/st/inbill/DivDialog.vue +++ b/wms/nladmin-ui/src/views/wms/st/inbill/DivDialog.vue @@ -14,18 +14,18 @@ 入库分配 - - - 全部分配 - - + + + + + + + + + + + + 关闭 @@ -349,7 +349,6 @@ export default { this.crud.notify('请选择入库点', CRUD.NOTIFICATION_TYPE.INFO) return } - debugger if (this.form.tableMater.length === 0) { this.crud.notify('请先选择一条明细！', CRUD.NOTIFICATION_TYPE.INFO) return @@ -364,23 +363,23 @@ export default { }) }) }, - allDivStruct() { - if (!this.sect_id) { - this.crud.notify('请先选择虚拟库区区域！', CRUD.NOTIFICATION_TYPE.INFO) - return - } - this.allDivBtn = true - const data = {} - data.sect_id = this.sect_id - data.iostorinv_id = this.openParam[0].iostorinv_id - crudRawAssist.allDivStruct(data).then(res => { - crudRawAssist.getIODtl({ 'bill_code': this.openParam[0].bill_code, 'open_flag': '1' }).then(res => { - this.openParam = res - }) - }).finally(() => { - this.allDivBtn = false - }) - }, + // allDivStruct() { + // if (!this.sect_id) { + // this.crud.notify('请先选择虚拟库区区域！', CRUD.NOTIFICATION_TYPE.INFO) + // return + // } + // this.allDivBtn = true + // const data = {} + // data.sect_id = this.sect_id + // data.iostorinv_id = this.openParam[0].iostorinv_id + // crudRawAssist.allDivStruct(data).then(res => { + // crudRawAssist.getIODtl({ 'bill_code': this.openParam[0].bill_code, 'open_flag': '1' }).then(res => { + // this.openParam = res + // }) + // }).finally(() => { + // this.allDivBtn = false + // }) + // }, divStruct() { if (this.form.tableMater.length === 0) { this.crud.notify('请先选择一条明细！', CRUD.NOTIFICATION_TYPE.INFO)