diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/QMD_ME_MATERIAL.wql b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/QMD_ME_MATERIAL.wql index fb52826d0..e42bb7ce0 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/QMD_ME_MATERIAL.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/QMD_ME_MATERIAL.wql @@ -45,34 +45,19 @@ PAGEQUERY SELECT mb.*, - class.class_code, - class.class_name, unit_name, - '50' as standard_weight, - unit_name as base_unit_id_name, - class2.class_code as product_series_code, - class2.class_name as product_series_name - + unit_name as base_unit_id_name FROM md_me_materialbase mb - LEFT JOIN MD_PB_ClassStandard class ON class.class_id = mb.material_type_id LEFT JOIN md_pb_measureunit unit ON unit.measure_unit_id = mb.base_unit_id - left join MD_PB_ClassStandard class2 on class2.class_id =mb.product_series WHERE mb.is_delete = '0' - and 输入.idssql OPTION 输入.search <> "" ( mb.material_code like 输入.search OR mb.material_name like 输入.search ) - ENDOPTION - OPTION 输入.class_code <> "" - class.class_code like 输入.class_code - ENDOPTION - OPTION 输入.classIds <> "" - class.class_id in 输入.classIds ENDOPTION ENDSELECT ENDPAGEQUERY diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/mdme.xls b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/mdme.xls index f9f0f2c94..f03e495c0 100644 Binary files a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/mdme.xls and b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/mdme.xls differ diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/stivt.xls b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/stivt.xls index ffdc4110b..5c1cc6a7c 100644 Binary files a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/stivt.xls and b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/stivt.xls differ diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/crm/rest/CrmToLmsController.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/crm/rest/CrmToLmsController.java index 86d1cefbc..c82545800 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/crm/rest/CrmToLmsController.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/crm/rest/CrmToLmsController.java @@ -1,5 +1,6 @@ package org.nl.wms.ext.crm.rest; +import cn.dev33.satoken.annotation.SaIgnore; import com.alibaba.fastjson.JSONObject; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -25,6 +26,7 @@ public class CrmToLmsController { @PostMapping("/getCustomerInfo") @Log("CRM给LMS推送客户信息") @ApiOperation("CRM给LMS推送客户信息") + @SaIgnore public ResponseEntity momRollFoilWeighing(@RequestBody JSONObject jo) { return new ResponseEntity<>(crmToLmsService.getCustomerInfo(jo), HttpStatus.OK); } @@ -32,6 +34,7 @@ public class CrmToLmsController { @PostMapping("/getCPIvtInfo") @Log("CRM获取LMS成品库存信息") @ApiOperation("CRM获取LMS成品库存信息") + @SaIgnore public ResponseEntity getCPIvtInfo(@RequestBody JSONObject jo) { return new ResponseEntity<>(crmToLmsService.getCPIvtInfo(jo), HttpStatus.OK); } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/crm/service/impl/CrmToLmsServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/crm/service/impl/CrmToLmsServiceImpl.java index 640db5f33..5cbc290c8 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/crm/service/impl/CrmToLmsServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/crm/service/impl/CrmToLmsServiceImpl.java @@ -1,19 +1,26 @@ package org.nl.wms.ext.crm.service.impl; import cn.hutool.core.util.IdUtil; +import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.nl.modules.wql.WQL; import org.nl.wms.ext.crm.service.CrmToLmsService; import org.nl.modules.wql.core.bean.WQLObject; +import org.nl.wms.log.LokiLog; +import org.nl.wms.log.LokiLogType; import org.springframework.stereotype.Service; +import java.util.HashMap; + @Service @RequiredArgsConstructor @Slf4j public class CrmToLmsServiceImpl implements CrmToLmsService { + @LokiLog(type = LokiLogType.CRM_TO_LMS) @Override public JSONObject getCustomerInfo(JSONObject row) { @@ -55,41 +62,49 @@ public class CrmToLmsServiceImpl implements CrmToLmsService { return result; } + @LokiLog(type = LokiLogType.CRM_TO_LMS) @Override public JSONObject getCPIvtInfo(JSONObject jo) { log.info("getCPIvtInfo输入参数为：----------------------" + jo.toString()); - /*String material_code = jo.getString("material_code"); + + String material_code = jo.getString("material_code"); String material_name = jo.getString("material_name"); String mfgordername = jo.getString("mfgordername"); String customername = jo.getString("customername"); String customerdescription = jo.getString("customerdescription"); + String width = jo.getString("width"); - HashMap map = new HashMap<>(); - map.put("")*/ + HashMap map = new HashMap<>(); + if (StrUtil.isNotEmpty(material_code)) { + map.put("material_code", material_code); + } + if (StrUtil.isNotEmpty(material_name)) { + map.put("material_name", material_name); + } + if (StrUtil.isNotEmpty(mfgordername)) { + String[] split = mfgordername.split(","); + String ids = "('"; + for (int i = 0; i < split.length; i++) { + if (i == split.length - 1 || split.length == 1) { + ids += split[i] + "')"; + } else { + ids += split[i] + "','"; + } + } + map.put("mfgordername", ids); + } + if (StrUtil.isNotEmpty(customername)) { + map.put("customername", customername); + } + if (StrUtil.isNotEmpty(customerdescription)) { + map.put("customerdescription", customerdescription); + } + if (StrUtil.isNotEmpty(width)) { + map.put("width", width); + } //将查询条件带入，查询LMS成品库库存信息 - //JSONArray rows = WQL.getWO("").addParamMap(jo).addParam("flag","1").process().getResultJSONArray(0); + JSONArray rows = WQL.getWO("QCRM_001").addParamMap(map).addParam("flag", "1").process().getResultJSONArray(0); - JSONArray rows = new JSONArray(); - - JSONObject row = new JSONObject(); - row.put("material_code", "物料编码"); - row.put("material_name", "物料名称"); - row.put("pcsn", "子卷批次"); - row.put("mfgordername", "销售订单及行号"); - row.put("customername", "客户编号"); - row.put("customerdescription", "客户名称"); - row.put("dateoffginbound", "入库日期"); - row.put("packageboxsn", "木箱唯一码"); - row.put("width", "产品规格（幅宽）"); - row.put("thickness", "产品厚度"); - row.put("netweight", "净重"); - row.put("length", "长度"); - row.put("warehouse_code", "仓库编码"); - row.put("dateofproduction", "生产日期"); - row.put("unplanproductproperty", "物性"); - - rows.add(row); - rows.add(row); JSONObject result = new JSONObject(); result.put("RTYPE", "S"); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/rest/MesToLmsController.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/rest/MesToLmsController.java index 35ca45bcb..2075eafc1 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/rest/MesToLmsController.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/rest/MesToLmsController.java @@ -1,6 +1,7 @@ package org.nl.wms.ext.mes.rest; import cn.dev33.satoken.annotation.SaIgnore; +import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -39,6 +40,14 @@ public class MesToLmsController { return new ResponseEntity<>(mesToLmsService.momRollFoilWeighing(jo), HttpStatus.OK); } + @PostMapping("test") + @Log("MES获取AGV称重信息") + @ApiOperation("MES获取AGV称重信息") + @SaIgnore + public ResponseEntity test(@RequestBody JSONObject jo) { + return new ResponseEntity<>(mesToLmsService.test(jo), HttpStatus.OK); + } + @PostMapping("/momRollFoilComplete") @Log("MES执行下卷动作告诉LMS") @ApiOperation("MES执行下卷动作告诉LMS") @@ -75,8 +84,8 @@ public class MesToLmsController { @Log("当母卷开始分切时，MES系统会将对应的子卷进站信息发送给只能物流系统，一方面物流系统可以预估下个母卷的送达时间，也可以闭环期分切计划指令") @ApiOperation("当母卷开始分切时，MES系统会将对应的子卷进站信息发送给只能物流系统，一方面物流系统可以预估下个母卷的送达时间，也可以闭环期分切计划指令") @SaIgnore - public ResponseEntity childRollCutStartComp(@RequestBody JSONObject jo) { - return new ResponseEntity<>(mesToLmsService.childRollCutStartComp(jo), HttpStatus.OK); + public ResponseEntity childRollCutStartComp(@RequestBody JSONArray ja) { + return new ResponseEntity<>(mesToLmsService.childRollCutStartComp(ja), HttpStatus.OK); } @PostMapping("/childRollPackComplete") diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/MesToLmsService.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/MesToLmsService.java index ebdadf3d8..989d15718 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/MesToLmsService.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/MesToLmsService.java @@ -1,5 +1,6 @@ package org.nl.wms.ext.mes.service; +import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; public interface MesToLmsService { @@ -13,6 +14,8 @@ public interface MesToLmsService { */ JSONObject momRollFoilWeighing(JSONObject param); + JSONObject test(JSONObject param); + /** * MES执行下卷动作告诉LMS */ @@ -36,7 +39,7 @@ public interface MesToLmsService { /** * 当母卷开始分切时，MES系统会将对应的子卷进站信息发送给只能物流系统，一方面物流系统可以预估下个母卷的送达时间，也可以闭环期分切计划指令 */ - JSONObject childRollCutStartComp(JSONObject param); + JSONObject childRollCutStartComp(JSONArray param); /** * 包装完成，传智能物流包装箱与子卷关系及子卷属性值，LMS执行入库 diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/LmsToMesServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/LmsToMesServiceImpl.java index bb5a897c5..1aa35985c 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/LmsToMesServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/LmsToMesServiceImpl.java @@ -9,6 +9,8 @@ import lombok.extern.slf4j.Slf4j; import org.nl.modules.system.service.impl.ParamServiceImpl; import org.nl.modules.wql.util.SpringContextHolder; import org.nl.wms.ext.mes.service.LmsToMesService; +import org.nl.wms.log.LokiLog; +import org.nl.wms.log.LokiLogType; import org.springframework.http.HttpStatus; import org.springframework.stereotype.Service; @@ -25,6 +27,7 @@ public class LmsToMesServiceImpl implements LmsToMesService { * * @return */ + @LokiLog(type = LokiLogType.LMS_TO_MES) @Override public JSONObject momRollFoilWeighing(JSONObject param) { log.info("momRollFoilWeighing接口输入参数为：-------------------"+param); @@ -72,6 +75,7 @@ public class LmsToMesServiceImpl implements LmsToMesService { * * @return */ + @LokiLog(type = LokiLogType.LMS_TO_MES) @Override public JSONObject momRollBakeInBound(JSONObject param) { log.info("momRollBakeInBound接口输入参数为：-------------------"+param.toString()); @@ -117,6 +121,7 @@ public class LmsToMesServiceImpl implements LmsToMesService { * * @return */ + @LokiLog(type = LokiLogType.LMS_TO_MES) @Override public JSONObject momRollBakeOutBound(JSONObject param) { log.info("momRollBakeOutBound接口输入参数为：-------------------"+param.toString()); @@ -162,6 +167,7 @@ public class LmsToMesServiceImpl implements LmsToMesService { * * @return */ + @LokiLog(type = LokiLogType.LMS_TO_MES) @Override public JSONObject momRollSemiFGInboundComplete(JSONObject param) { log.info("momRollSemiFGInboundComplete接口输入参数为：-------------------"+param.toString()); @@ -207,6 +213,7 @@ public class LmsToMesServiceImpl implements LmsToMesService { * * @return */ + @LokiLog(type = LokiLogType.LMS_TO_MES) @Override public JSONObject airSwellWithPaperTubeAssComplete(JSONObject param) { log.info("airSwellWithPaperTubeAssComplete接口输入参数为：-------------------"+param.toString()); @@ -252,6 +259,7 @@ public class LmsToMesServiceImpl implements LmsToMesService { * * @return */ + @LokiLog(type = LokiLogType.LMS_TO_MES) @Override public JSONObject cutPlanMomRollDeliveryComplete(JSONObject param) { log.info("cutPlanMomRollDeliveryComplete接口输入参数为：-------------------"+param.toString()); @@ -297,6 +305,7 @@ public class LmsToMesServiceImpl implements LmsToMesService { * * @return */ + @LokiLog(type = LokiLogType.LMS_TO_MES) @Override public JSONObject airSwellWithPaperTubeAssArrival(JSONObject param) { log.info("airSwellWithPaperTubeAssArrival接口输入参数为：-------------------"+param.toString()); @@ -342,6 +351,7 @@ public class LmsToMesServiceImpl implements LmsToMesService { * * @return */ + @LokiLog(type = LokiLogType.LMS_TO_MES) @Override public JSONObject childRollFGInboundComplete(JSONObject param) { log.info("childRollFGInboundComplete接口输入参数为：-------------------"+param.toString()); @@ -387,6 +397,7 @@ public class LmsToMesServiceImpl implements LmsToMesService { * * @return */ + @LokiLog(type = LokiLogType.LMS_TO_MES) @Override public JSONObject childRollFGOutboundComplete(JSONObject param) { log.info("childRollFGOutboundComplete接口输入参数为：-------------------"+param.toString()); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/MesToLmsServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/MesToLmsServiceImpl.java index ed2d41d1d..23c336677 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/MesToLmsServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/MesToLmsServiceImpl.java @@ -11,7 +11,10 @@ import lombok.extern.slf4j.Slf4j; import org.nl.modules.common.exception.BadRequestException; import org.nl.modules.wql.core.bean.WQLObject; import org.nl.wms.ext.mes.service.MesToLmsService; +import org.nl.wms.log.LokiLog; +import org.nl.wms.log.LokiLogType; import org.springframework.stereotype.Service; +import sun.security.krb5.internal.crypto.Des; @Service @RequiredArgsConstructor @@ -33,6 +36,7 @@ public class MesToLmsServiceImpl implements MesToLmsService { * * @return */ + @LokiLog(type = LokiLogType.MES_TO_LMS) @Override public JSONObject momRollFoilStart(JSONObject param) { log.info("momRollFoilStart接口输入参数为：-------------------" + param.toString()); @@ -61,7 +65,6 @@ public class MesToLmsServiceImpl implements MesToLmsService { if (ObjectUtil.isEmpty(TheoryHeight)) throw new BadRequestException("理论长度不能为空"); if (ObjectUtil.isEmpty(EqpVelocity)) throw new BadRequestException("生产速度不能为空"); if (ObjectUtil.isEmpty(UpCoilerDate)) throw new BadRequestException("开始时间不能为空"); - if (ObjectUtil.isEmpty(IsReloadSend)) throw new BadRequestException("是否重新更新不能为空"); JSONObject jsonPoint = pointTab.query("ext_code ='" + ResourceName + "'").uniqueResult(0); if (ObjectUtil.isEmpty(jsonPoint)) { @@ -100,7 +103,7 @@ public class MesToLmsServiceImpl implements MesToLmsService { System.out.println(result); } catch (Exception e) { // 返回失败 - result.put("RTYPE", "S"); + result.put("RTYPE", "E"); result.put("RTMSG", "操作失败!" + e.getMessage()); result.put("RTOAL", 0); result.put("RTDAT", null); @@ -114,41 +117,96 @@ public class MesToLmsServiceImpl implements MesToLmsService { * * @return */ + @LokiLog(type = LokiLogType.MES_TO_LMS) @Override public JSONObject momRollFoilWeighing(JSONObject param) { log.info("momRollFoilStart接口输入参数为：-------------------" + param.toString()); - String ContainerName = param.getString("ContainerName"); - String ResourceName = param.getString("ResourceName"); - //查询该母卷号、设备号对应的生箔工单 - JSONObject raw_jo = WQLObject.getWQLObject("PDM_BI_RawFoilWorkOrder").query("container_name ='" + ContainerName + "' AND resource_name = '" + ResourceName + "'").uniqueResult(0); - - if (ObjectUtil.isEmpty(raw_jo)) { - throw new BadRequestException("未查询到对应的生箔工单！"); - } - - JSONArray data = new JSONArray(); - JSONObject json = new JSONObject(); - json.put("ContainerName", raw_jo.getString("container_name")); - json.put("ResourceName", raw_jo.getString("resource_name")); - json.put("Weight", String.format("%.2f", raw_jo.getDoubleValue("productin_qty"))); - json.put("WeighDate", DateUtil.now()); - data.add(json); JSONObject result = new JSONObject(); - result.put("RTYPE", "S"); - result.put("RTMSG", "操作成功!"); - result.put("RTOAL", 1); - result.put("RTDAT", data); - System.out.println(result); + try { + String ContainerName = param.getString("ContainerName"); + String ResourceName = param.getString("ResourceName"); + //查询该母卷号、设备号对应的生箔工单 + JSONObject raw_jo = WQLObject.getWQLObject("PDM_BI_RawFoilWorkOrder").query("container_name ='" + ContainerName + "' AND resource_name = '" + ResourceName + "'").uniqueResult(0); + + if (ObjectUtil.isEmpty(raw_jo)) { + throw new BadRequestException("未查询到对应的生箔工单！"); + } + + JSONArray data = new JSONArray(); + JSONObject json = new JSONObject(); + json.put("ContainerName", raw_jo.getString("container_name")); + json.put("ResourceName", raw_jo.getString("resource_name")); + json.put("Weight", String.format("%.2f", raw_jo.getDoubleValue("productin_qty"))); + json.put("WeighDate", DateUtil.now()); + data.add(json); + + result.put("RTYPE", "S"); + result.put("RTMSG", "操作成功!"); + result.put("RTOAL", 1); + result.put("RTDAT", data); + System.out.println(result); + + } catch (Exception e) { + result.put("RTYPE", "E"); + result.put("RTMSG", "操作失败!" + e.getMessage()); + result.put("RTOAL", 0); + result.put("RTDAT", null); + System.out.println(result); + } return result; } + @LokiLog(type = LokiLogType.MES_TO_LMS) + @Override + public JSONObject test(JSONObject param) { + log.info("momRollFoilStart接口输入参数为：-------------------" + param.toString()); + + JSONObject result = new JSONObject(); + try { + String ContainerName = param.getString("ContainerName"); + String ResourceName = param.getString("ResourceName"); + String weight = param.getString("weight"); + //查询该母卷号、设备号对应的生箔工单 + JSONObject raw_jo = WQLObject.getWQLObject("PDM_BI_RawFoilWorkOrder").query("container_name ='" + ContainerName + "' AND resource_name = '" + ResourceName + "'").uniqueResult(0); + + if (ObjectUtil.isEmpty(raw_jo)) { + throw new BadRequestException("未查询到对应的生箔工单！"); + } + + if (StrUtil.isEmpty(weight)) { + throw new BadRequestException("未输入重量！"); + } + + raw_jo.put("productin_qty",weight); + + WQLObject.getWQLObject("PDM_BI_RawFoilWorkOrder").update(raw_jo); + + result.put("RTYPE", "S"); + result.put("RTMSG", "操作成功!"); + result.put("RTOAL", 1); + System.out.println(result); + + } catch (Exception e) { + result.put("RTYPE", "E"); + result.put("RTMSG", "操作失败!" + e.getMessage()); + result.put("RTOAL", 0); + result.put("RTDAT", null); + System.out.println(result); + } + return result; + } + + + + /** * MES执行下卷动作告诉LMS * * @param param * @return */ + @LokiLog(type = LokiLogType.MES_TO_LMS) @Override public JSONObject momRollFoilComplete(JSONObject param) { log.info("momRollFoilComplete接口输入参数为：-------------------" + param.toString()); @@ -168,6 +226,7 @@ public class MesToLmsServiceImpl implements MesToLmsService { * @param param * @return */ + @LokiLog(type = LokiLogType.MES_TO_LMS) @Override public JSONObject momRollBakeNextSpecTransfer(JSONObject param) { log.info("momRollBakeNextSpecTransfer接口输入参数为：-------------------" + param.toString()); @@ -187,6 +246,7 @@ public class MesToLmsServiceImpl implements MesToLmsService { * @param param * @return */ + @LokiLog(type = LokiLogType.MES_TO_LMS) @Override public JSONObject cutPlanTransfer(JSONObject param) { log.info("cutPlanTransfer接口输入参数为：-------------------" + param.toString()); @@ -210,6 +270,7 @@ public class MesToLmsServiceImpl implements MesToLmsService { JSONObject result = new JSONObject(); try { + // 基础校验 if (ObjectUtil.isEmpty(orderType)) throw new BadRequestException("分切订单类型不能为空"); if (ObjectUtil.isEmpty(ContainerName)) throw new BadRequestException("子卷号不能为空"); @@ -281,7 +342,7 @@ public class MesToLmsServiceImpl implements MesToLmsService { json.put("split_height", SplitHeight); json.put("split_weight", SplitWeight); json.put("start_time", DateUtil.now()); - json.put("status", "1"); + json.put("status", "0"); json.put("is_parent_ok", "0"); json.put("is_child_tz_ok", "0"); json.put("is_child_ps_ok", "0"); @@ -294,7 +355,7 @@ public class MesToLmsServiceImpl implements MesToLmsService { result.put("RTDAT", null); System.out.println(result); } catch (Exception e) { - result.put("RTYPE", "S"); + result.put("RTYPE", "E"); result.put("RTMSG", "操作失败!" + e.getMessage()); result.put("RTOAL", 0); result.put("RTDAT", null); @@ -309,6 +370,7 @@ public class MesToLmsServiceImpl implements MesToLmsService { * @param param * @return */ + @LokiLog(type = LokiLogType.MES_TO_LMS) @Override public JSONObject callNextAssAndMomRoll(JSONObject param) { log.info("callNextAssAndMomRoll接口输入参数为：-------------------" + param.toString()); @@ -327,9 +389,11 @@ public class MesToLmsServiceImpl implements MesToLmsService { * @param param * @return */ + @LokiLog(type = LokiLogType.MES_TO_LMS) @Override - public JSONObject childRollCutStartComp(JSONObject param) { + public JSONObject childRollCutStartComp(JSONArray param) { log.info("childRollCutStartComp接口输入参数为：-------------------" + param.toString()); + JSONObject result = new JSONObject(); result.put("RTYPE", "S"); result.put("RTMSG", "操作成功!"); @@ -345,9 +409,71 @@ public class MesToLmsServiceImpl implements MesToLmsService { * @param param * @return */ + @LokiLog(type = LokiLogType.MES_TO_LMS) @Override public JSONObject childRollPackComplete(JSONObject param) { log.info("childRollPackComplete接口输入参数为：-------------------" + param.toString()); + + String isUnPlanProductionBox = param.getString("isUnPlanProductionBox"); // 生产订单 + String QuanlityInBox = param.getString("QuanlityInBox"); // 产品编码 + String BoxWeight = param.getString("BoxWeight"); // 产品名称 + String QualityGuaranPeriod = param.getString("QualityGuaranPeriod"); // 分切机台编码 + String ProductName = param.getString("ProductName"); // 来源卷位置 + String Description = param.getString("Description"); // 来源卷位置 + String DateOfFGInbound = param.getString("DateOfFGInbound"); // 来源卷位置 + + JSONArray details = param.getJSONArray("details"); + + for (int i = 0; i < details.size(); i++) { + JSONObject detail = details.getJSONObject(i); + + String PackageBoxSN = detail.getString("PackageBoxSN"); // 分切订单类型 + String ContainerName = detail.getString("ContainerName"); // 子卷号 + String SaleOrderName = detail.getString("SaleOrderName"); // 产品编码 + String CustomerName = detail.getString("CustomerName"); // 产品名称 + String CustomerDescription = detail.getString("CustomerDescription"); // 来源卷位置 + String Width = detail.getString("Width"); // 分切机台编码 + String Thickness = detail.getString("Thickness"); // 分切组 + String MassPerUnitArea = detail.getString("MassPerUnitArea"); // 生产顺序 + String NetWeight = detail.getString("NetWeight"); // 生产订单 + String Length = detail.getString("Length"); + String DateOfProduction = detail.getString("DateOfProduction"); + String isUnPlanProduction = detail.getString("isUnPlanProduction"); + String UnPlanProductProperty1 = detail.getString("UnPlanProductProperty1"); + String UnPlanProductProperty2 = detail.getString("UnPlanProductProperty2"); + String UnPlanProductProperty3 = detail.getString("UnPlanProductProperty3"); + + JSONObject jo = new JSONObject(); + jo.put("workorder_id", IdUtil.getSnowflake(1, 1).nextId()); + jo.put("package_box_SN", PackageBoxSN); + jo.put("quanlity_in_box", QuanlityInBox); + jo.put("box_weight", BoxWeight); + jo.put("quality_guaran_period", QualityGuaranPeriod); + jo.put("sale_order_name", SaleOrderName); + jo.put("customer_name", CustomerName); + jo.put("customer_description", CustomerDescription); + jo.put("product_name", ProductName); + jo.put("product_description", Description); + jo.put("date_of_FG_inbound", DateOfFGInbound); + jo.put("container_name", ContainerName); + jo.put("width", Width); + jo.put("thickness", Thickness); + jo.put("mass_per_unit_area", MassPerUnitArea); + jo.put("net_weight", NetWeight); + jo.put("length", Length); + jo.put("date_of_production", DateOfProduction); + jo.put("is_un_plan_production", isUnPlanProduction); + jo.put("un_plan_product_property1", UnPlanProductProperty1); + jo.put("un_plan_product_property2", UnPlanProductProperty2); + jo.put("un_plan_product_property3", UnPlanProductProperty3); + jo.put("status", "0"); + jo.put("create_id", "1"); + jo.put("create_name", "管理员"); + jo.put("create_time", DateUtil.now()); + WQLObject tab = WQLObject.getWQLObject("PDM_BI_SubPackageRelation"); + tab.insert(jo); + } + JSONObject result = new JSONObject(); result.put("RTYPE", "S"); result.put("RTMSG", "操作成功!"); @@ -363,6 +489,7 @@ public class MesToLmsServiceImpl implements MesToLmsService { * @param param * @return */ + @LokiLog(type = LokiLogType.MES_TO_LMS) @Override public JSONObject inventoryTransferInfoSync(JSONObject param) { log.info("inventoryTransferInfoSync接口输入参数为：-------------------" + param.toString()); @@ -381,6 +508,7 @@ public class MesToLmsServiceImpl implements MesToLmsService { * @param param * @return */ + @LokiLog(type = LokiLogType.MES_TO_LMS) @Override public JSONObject childRollInfoUpdate(JSONObject param) { log.info("childRollInfoUpdate接口输入参数为：-------------------" + param.toString()); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/sap/service/impl/LmsToSapServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/sap/service/impl/LmsToSapServiceImpl.java index e2c0aee75..2c073f472 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/sap/service/impl/LmsToSapServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/sap/service/impl/LmsToSapServiceImpl.java @@ -9,6 +9,8 @@ import lombok.extern.slf4j.Slf4j; import org.nl.modules.system.service.impl.ParamServiceImpl; import org.nl.modules.wql.util.SpringContextHolder; import org.nl.wms.ext.sap.service.LmsToSapService; +import org.nl.wms.log.LokiLog; +import org.nl.wms.log.LokiLogType; import org.springframework.http.HttpStatus; import org.springframework.stereotype.Service; @@ -17,6 +19,7 @@ import org.springframework.stereotype.Service; @Slf4j public class LmsToSapServiceImpl implements LmsToSapService { + @LokiLog(type = LokiLogType.LMS_TO_SAP) @Override public JSONObject returnDelivery(JSONObject jo) { /* @@ -74,6 +77,7 @@ public class LmsToSapServiceImpl implements LmsToSapService { } } + @LokiLog(type = LokiLogType.LMS_TO_SAP) @Override public JSONObject returnMoveDtl(JSONObject jo) { /* diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/wql/QCRM_001.wql b/lms/nladmin-system/src/main/java/org/nl/wms/ext/wql/QCRM_001.wql new file mode 100644 index 000000000..b91477fcf --- /dev/null +++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/wql/QCRM_001.wql @@ -0,0 +1,89 @@ +[交易说明] + 交易名： 二楼到一楼业务 + 所属模块： + 功能简述： + 版权所有： + 表引用： + 版本经历： + +[数据库] + --指定数据库，为空采用默认值，默认为db.properties中列出的第一个库 + +[IO定义] + ################################################# + ## 表字段对应输入参数 + ################################################# + 输入.flag TYPEAS s_string + 输入.material_code TYPEAS s_string + 输入.material_name TYPEAS s_string + 输入.mfgordername TYPEAS f_string + 输入.customername TYPEAS s_string + 输入.customerdescription TYPEAS s_string + 输入.width TYPEAS f_string + + +[临时表] + --这边列出来的临时表就会在运行期动态创建 + +[临时变量] + --所有中间过程变量均可在此处定义 + +[业务过程] + + ########################################## + # 1、输入输出检查 # + ########################################## + + + ########################################## + # 2、主过程前处理 # + ########################################## + + + ########################################## + # 3、业务主过程 # + ########################################## + + IF 输入.flag = "1" + QUERY + SELECT + sub.product_name AS material_code, + sub.product_description AS material_name, + sub.container_name AS pcsn, + sub.sale_order_name AS mfgordername, + sub.customer_name AS customername, + sub.customer_description AS customerdescription, + sub.date_of_FG_inbound AS dateoffginbound, + sub.package_box_sn AS packageboxsn, + sub.width, + sub.thickness, + sub.net_weight AS netweight, + sub.length, + 'CP01' AS warehouse_code, + sub.date_of_production AS dateofproduction, + sub.un_plan_product_property1 AS unplanproductproperty + FROM + pdm_bi_subpackagerelation sub + WHERE + sub.`status` = '2' + OPTION 输入.material_code <> "" + product_name = 输入.material_code + ENDOPTION + OPTION 输入.material_name <> "" + product_description = 输入.material_name + ENDOPTION + OPTION 输入.mfgordername <> "" + SUBSTRING_INDEX(sale_order_name, "-", 1) IN 输入.mfgordername + ENDOPTION + OPTION 输入.customername <> "" + customer_name = 输入.customername + ENDOPTION + OPTION 输入.customerdescription <> "" + customer_description = 输入.customerdescription + ENDOPTION + OPTION 输入.width <> "" + width >= 输入.width + ENDOPTION + ENDSELECT + ENDQUERY + ENDIF \ No newline at end of file diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/log/LokiLogType.java b/lms/nladmin-system/src/main/java/org/nl/wms/log/LokiLogType.java index b11dcef89..76e4693a8 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/log/LokiLogType.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/log/LokiLogType.java @@ -9,8 +9,10 @@ public enum LokiLogType { DEFAULT("默认"), LMS_TO_MES("LMS请求MES"), MES_TO_LMS("MES请求LMS"), - LMS_TO_SAP("LMS请求MES"), - SAP_TO_LMS("MES请求LMS"); + LMS_TO_CRM("LMS请求CRM"), + CRM_TO_LMS("CRM请求LMS"), + LMS_TO_SAP("LMS请求SAP"), + SAP_TO_LMS("SAP请求LMS"); private String desc; diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/pdm.xls b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/pdm.xls index 1eb9ae262..d44f13a7e 100644 Binary files a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/pdm.xls and b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/pdm.xls differ diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/rest/RegionioInController.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/rest/InStorController.java similarity index 98% rename from lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/rest/RegionioInController.java rename to lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/rest/InStorController.java index 6f237a2a0..28fcf0a2d 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/rest/RegionioInController.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/rest/InStorController.java @@ -27,7 +27,7 @@ import java.util.Map; @Api(tags = "区域入库管理") @RequestMapping("/api/regionioIn") @Slf4j -public class RegionioInController { +public class InStorController { private final RegionioInService rgionioInService; diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/rest/RawAssistIStorController.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/rest/RawAssistIStorController.java new file mode 100644 index 000000000..34e644426 --- /dev/null +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/rest/RawAssistIStorController.java @@ -0,0 +1,225 @@ +package org.nl.wms.st.inbill.rest; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.nl.modules.logging.annotation.Log; +import org.nl.wms.st.inbill.service.RawAssistIStorService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.domain.Pageable; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; + +import java.util.Map; + +@RestController +@RequiredArgsConstructor +@Api(tags = "PC端原辅料入库") +@RequestMapping("/api/in/rawAssist") +@Slf4j +public class RawAssistIStorController { + + @Autowired + private RawAssistIStorService rawAssistIStorService; + + @GetMapping + @Log("查询原辅料入库单据") + @ApiOperation("查询原辅料入库单据") + //@PreAuthorize("@el.check('checkoutbill:list')") + public ResponseEntity query(@RequestParam Map whereJson, Pageable page){ + return new ResponseEntity<>(rawAssistIStorService.pageQuery(whereJson,page), HttpStatus.OK); + } + + @GetMapping("/getType") + @Log("查询单据类型下拉框") + @ApiOperation("查询单据类型下拉框") + //@PreAuthorize("@el.check('materialtype:list')") + public ResponseEntity getType(@RequestParam Map whereJson) { + return new ResponseEntity<>(rawAssistIStorService.getType(whereJson), HttpStatus.OK); + } + + @Log("删除出入库单") + @ApiOperation("删除出入库单") + //@PreAuthorize("@el.check('sectattr:del')") + @DeleteMapping + public ResponseEntity delete(@RequestBody Long[] ids) { + rawAssistIStorService.deleteAll(ids); + return new ResponseEntity<>(HttpStatus.OK); + } + + @GetMapping("/getBillDtl") + @Log("查询到货通知单") + @ApiOperation("查询到货通知单") + //@PreAuthorize("@el.check('materialtype:list')") + public ResponseEntity getBillDtl(@RequestParam Map whereJson,Pageable page) { + return new ResponseEntity<>(rawAssistIStorService.getBillDtl(whereJson,page), HttpStatus.OK); + } + + @PostMapping() + @Log("新增入库单") + @ApiOperation("新增入库单") + //@PreAuthorize("@el.check('structrelamaterial:edit')") + public ResponseEntity insertDtl(@RequestBody Map whereJson){ + rawAssistIStorService.insertDtl(whereJson); + return new ResponseEntity<>(HttpStatus.CREATED); + } + @PutMapping + @Log("修改入库单") + @ApiOperation("修改入库单") + //@PreAuthorize("@el.check('sectattr:edit')") + public ResponseEntity update(@RequestBody Map whereJson){ + rawAssistIStorService.update(whereJson); + return new ResponseEntity<>(HttpStatus.NO_CONTENT); + } + + @GetMapping("/getIODtl") + @Log("查询出入库单明细") + @ApiOperation("查询出入库单明细") + //@PreAuthorize("@el.check('materialtype:list')") + public ResponseEntity getIODtl(@RequestParam Map whereJson) { + return new ResponseEntity<>(rawAssistIStorService.getIODtl(whereJson), HttpStatus.OK); + } + + @PostMapping("/commit") + @Log("出入单提交") + @ApiOperation("出入单提交") + //@PreAuthorize("@el.check('materialtype:list')") + public ResponseEntity commit(@RequestBody Map whereJson) { + rawAssistIStorService.commit(whereJson); + return new ResponseEntity<>(HttpStatus.NO_CONTENT); + } + + @PostMapping("/confirmvehicle") + @Log("组盘确认") + @ApiOperation("组盘确认") + //@PreAuthorize("@el.check('materialtype:list')") + public ResponseEntity confirmvehicle(@RequestBody Map whereJson) { + rawAssistIStorService.confirmvehicle(whereJson); + return new ResponseEntity<>(HttpStatus.NO_CONTENT); + } + + @PostMapping("/deleteDisDtl") + @Log("删除一行") + @ApiOperation("删除一行") + //@PreAuthorize("@el.check('materialtype:list')") + public ResponseEntity deleteDisDtl(@RequestBody Map whereJson) { + rawAssistIStorService.deleteDisDtl(whereJson); + return new ResponseEntity<>(HttpStatus.NO_CONTENT); + } + + @PostMapping("/getDisDtl") + @Log("查询入库分配载具明细") + @ApiOperation("查询入库分配载具明细") + //@PreAuthorize("@el.check('materialtype:list')") + public ResponseEntity getDisDtl(@RequestBody Map whereJson) { + return new ResponseEntity<>(rawAssistIStorService.getDisDtl(whereJson), HttpStatus.OK); + } + + @PostMapping("/divStruct") + @Log("分配货位") + @ApiOperation("分配货位") + //@PreAuthorize("@el.check('materialtype:list')") + public ResponseEntity divStruct(@RequestBody Map whereJson) { + rawAssistIStorService.divStruct(whereJson); + return new ResponseEntity<>(HttpStatus.NO_CONTENT); + } + + @PostMapping("/unDivStruct") + @Log("取消分配货位") + @ApiOperation("取消分配货位") + //@PreAuthorize("@el.check('materialtype:list')") + public ResponseEntity unDivStruct(@RequestBody Map whereJson) { + rawAssistIStorService.unDivStruct(whereJson); + return new ResponseEntity<>(HttpStatus.NO_CONTENT); + } + + @PostMapping("/divPoint") + @Log("设置起点") + @ApiOperation("分配货位") + //@PreAuthorize("@el.check('materialtype:list')") + public ResponseEntity divPoint(@RequestBody Map whereJson) { + rawAssistIStorService.divPoint(whereJson); + return new ResponseEntity<>(HttpStatus.NO_CONTENT); + } + + @PostMapping("/queryTask") + @Log("查询任务") + @ApiOperation("查询任务") + //@PreAuthorize("@el.check('materialtype:list')") + public ResponseEntity queryTask(@RequestBody Map whereJson) { + return new ResponseEntity<>(rawAssistIStorService.queryTask(whereJson), HttpStatus.OK); + } + + @PostMapping("/bucketDtl") + @Log("查询托盘桶明细") + @ApiOperation("查询托盘桶明细") + //@PreAuthorize("@el.check('materialtype:list')") + public ResponseEntity bucketDtl(@RequestBody Map whereJson) { + return new ResponseEntity<>(rawAssistIStorService.bucketDtl(whereJson), HttpStatus.OK); + } + + @PostMapping("/updateTask") + @Log("变更任务") + @ApiOperation("变更任务") + //@PreAuthorize("@el.check('materialtype:list')") + public ResponseEntity updateTask(@RequestBody Map whereJson) { + rawAssistIStorService.updateTask(whereJson); + return new ResponseEntity<>(HttpStatus.NO_CONTENT); + } + + @PostMapping("/delTask") + @Log("删除任务") + @ApiOperation("删除任务") + //@PreAuthorize("@el.check('materialtype:list')") + public ResponseEntity delTask(@RequestBody Map whereJson) { + rawAssistIStorService.delTask(whereJson); + return new ResponseEntity<>(HttpStatus.NO_CONTENT); + } + + @PostMapping("/reIssueTask") + @Log("下发") + @ApiOperation("下发") + //@PreAuthorize("@el.check('materialtype:list')") + public ResponseEntity reIssueTask(@RequestBody Map whereJson) { + rawAssistIStorService.reIssueTask(whereJson); + return new ResponseEntity<>(HttpStatus.NO_CONTENT); + } + + @PostMapping("/confirmTask") + @Log("完成任务") + @ApiOperation("完成任务") + //@PreAuthorize("@el.check('materialtype:list')") + public ResponseEntity confirmTask(@RequestBody Map whereJson) { + rawAssistIStorService.confirmTask(whereJson); + return new ResponseEntity<>(HttpStatus.NO_CONTENT); + } + + @PostMapping("/cancelTask") + @Log("取消完成任务") + @ApiOperation("取消完成任务") + //@PreAuthorize("@el.check('materialtype:list')") + public ResponseEntity cancelTask(@RequestBody Map whereJson) { + rawAssistIStorService.cancelTask(whereJson); + return new ResponseEntity<>(HttpStatus.NO_CONTENT); + } + + @PostMapping("/confirm") + @Log("完成单据") + @ApiOperation("完成单据") + //@PreAuthorize("@el.check('materialtype:list')") + public ResponseEntity confirm(@RequestBody Map whereJson) { + rawAssistIStorService.confirm(whereJson); + return new ResponseEntity<>(HttpStatus.NO_CONTENT); + } + + @PostMapping("/backConfirm") + @Log("完成入库负单") + @ApiOperation("完成入库负单") + //@PreAuthorize("@el.check('materialtype:list')") + public ResponseEntity backConfirm(@RequestBody Map whereJson) { + rawAssistIStorService.backConfirm(whereJson); + return new ResponseEntity<>(HttpStatus.NO_CONTENT); + } +} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/CheckOutBillService.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/CheckOutBillService.java new file mode 100644 index 000000000..6ce038b14 --- /dev/null +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/CheckOutBillService.java @@ -0,0 +1,161 @@ +package org.nl.wms.st.inbill.service; + +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; +import org.springframework.data.domain.Pageable; + +import java.util.Map; + +public interface CheckOutBillService { + /** + * 查询数据分页 + * + * @param whereJson 条件 + * @param page 分页参数 + * @return Map + */ + Map pageQuery(Map whereJson, Pageable page); + + /** + * 查询数据分页 + * + * @param whereJson 条件 + * @param page 分页参数 + * @return Map + */ + Map queryAddDtl(Map whereJson, Pageable page); + /** + * 查询数据分页 + * + * @param whereJson 条件 + * @param page 分页参数 + * @return Map + */ + Map queryDtl(Map whereJson, Pageable page); + + /** + * 多选删除 + * @param ids / + */ + void deleteAll(Long[] ids); + /** + * 新增出库单 + * @param whereJson + * 参数举例： + * {bill_code=, stor_id=1473161852946092032, stor_code=01, stor_name=原材料库, bill_status=10, total_qty=2, detail_count=1, bill_type=010201, remark=, biz_date=2022-01-08, create_mode=, tableData=[{material_id=1309, material_code=090301010001, bill_status=10, material_name=碳化钨粉 02, pcsn=, quality_scode=02, ivt_level=01, is_active=1, plan_qty=2, qty_unit_name=千克\公斤, qty_unit_id=1, remark=, edit=true}]} + * / + */ + void insertDtl (Map whereJson); + /** + * 新增出库单 + * @param whereJson + * 参数举例： + * {bill_code=, stor_id=1473161852946092032, stor_code=01, stor_name=原材料库, bill_status=10, total_qty=2, detail_count=1, bill_type=010201, remark=, biz_date=2022-01-08, create_mode=, tableData=[{material_id=1309, material_code=090301010001, bill_status=10, material_name=碳化钨粉 02, pcsn=, quality_scode=02, ivt_level=01, is_active=1, plan_qty=2, qty_unit_name=千克\公斤, qty_unit_id=1, remark=, edit=true}]} + * / + */ + void insertDtlByJson(JSONObject whereJson); + /** + * 查询出库单明细 + * @param whereJson / + * @return + */ + JSONArray getOutBillDtl(Map whereJson); + /** + * 查询出库单分配明细 + * @param whereJson / + * @return + */ + JSONArray getOutBillDis(Map whereJson); + /** + * 查询出库单分配明细 + * @param whereJson / + * @return + */ + JSONArray getOutBillDisDtl(Map whereJson); + /** + * 查询出库单分配任务 + * @param whereJson / + * @return + */ + JSONArray getOutBillTask(Map whereJson); + /** + * 修改出库单 + * @param whereJson / + */ + void update(Map whereJson); + /** + * 全部分配，对同一出库单明细进行分配 + * @param whereJson / + */ + void allDiv(JSONObject whereJson); + /** + * 全部取消 + * @param whereJson / + */ + void allCancel(JSONObject whereJson); + /** + * 设置检验站点 + * @param whereJson / + */ + void setPoint(JSONObject whereJson); + /** + * 查询可分配库存 + * @param whereJson / + * @return + */ + JSONArray getStructIvt(Map whereJson); + /** + * 出库单手动分配 + * @param whereJson / + */ + void manualDiv(JSONObject whereJson); + /** + * 出库单强制确认 + * @param whereJson / + */ + void confirm(JSONObject whereJson); + /** + * 出库任务下发 + * @param whereJson / + */ + void issueTask(JSONObject whereJson); + /** + * 出库任务手动完成 + * @param whereJson / + */ + void finishTask(JSONObject whereJson); + /** + * 出库任务手动取消完成 + * @param whereJson / + */ + void cancleTaskfinish(JSONObject whereJson); + /** + * 查询单据字段 + * @return + */ + JSONArray getInvTypes(); + + /** + *查询出库单物料是否限制参数 + * @param form + * @return + */ + JSONObject getParamByCodeType(JSONObject form); + + /** + *查询点位区域类型 + * @param form + * @return + */ + JSONArray schAreaType(JSONObject form); + /** + * 出库单强制确认 + * @param whereJson / + */ + void backConfirm(JSONObject whereJson); + + /** + * 获取全部出入库业务类型 + */ + JSONArray getType(); +} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/RawAssistIStorService.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/RawAssistIStorService.java new file mode 100644 index 000000000..599676729 --- /dev/null +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/RawAssistIStorService.java @@ -0,0 +1,63 @@ +package org.nl.wms.st.inbill.service; + +import com.alibaba.fastjson.JSONArray; +import org.springframework.data.domain.Pageable; + +import java.util.Map; + +public interface RawAssistIStorService { + /** + * 查询数据分页 + * + * @param whereJson 条件 + * @param page 分页参数 + * @return Map + */ + Map pageQuery(Map whereJson, Pageable page); + + + JSONArray getType(Map whereJson); + + Map getBillDtl(Map whereJson,Pageable page); + + void insertDtl (Map whereJson); + + void deleteAll(Long[] ids); + + void update(Map whereJson); + + void commit(Map whereJson); + + JSONArray getIODtl(Map whereJson); + + void confirmvehicle(Map whereJson); + + void deleteDisDtl(Map whereJson); + + void divStruct(Map whereJson); + + void unDivStruct(Map whereJson); + + void divPoint(Map whereJson); + + void updateTask(Map whereJson); + + void delTask(Map whereJson); + + void reIssueTask(Map whereJson); + + void confirmTask(Map whereJson); + + void cancelTask(Map whereJson); + + void confirm(Map whereJson); + + void backConfirm(Map whereJson); + + JSONArray getDisDtl(Map whereJson); + + JSONArray queryTask(Map whereJson); + + JSONArray bucketDtl(Map whereJson); + +} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/StorPublicService.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/StorPublicService.java new file mode 100644 index 000000000..23e4b4e45 --- /dev/null +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/StorPublicService.java @@ -0,0 +1,46 @@ +package org.nl.wms.st.inbill.service; + +import com.alibaba.fastjson.JSONObject; + +public interface StorPublicService { + /** + * 出入库仓位库存修改 + * @param from 仓位库存变动信息 + * { + * struct_id ，仓位标识 + * material_id ，物料标识 + * quality_scode ，品质类型 + * pcsn ，批次 + * ivt_level ，库存等级 + * is_active ，是否可用 + * change_qty ，变动数(必填，大于0) + * bill_type_scode ，单据类型 + * inv_id，单据标识 + * bill_code ，单据编号 + * bill_table ，单据表名(非必填) + * qty_unit_id ，单位标识 + * qty_unit_name ，单位名称 + * } + * @param change_type_scode (变动类型：11-扣减可用; 12-增加可用;21-减库存; 22-加库存; 23-同时加; 24-同时减;25-同时减（配粉出库）31-加待入; 32-减待入;33-减待入加库存加可用;99-其它) + */ + void IOStor(JSONObject from, String change_type_scode); + + /** + * 出入库仓位点位更新 + * @param from 仓位点位变动信息 + * { + * struct_id ，仓位id + * point_code ，点位编码 + * lock_type ，锁定类型 + * storagevehicle_code ，载具编码 + * is_free，是否清除载具(1是，0或缺省为否) + * taskdtl_type锁定任务类型 + * taskdtl_id锁定任务明细标识 + * task_code锁定任务编码 + * inv_type锁定单据类型 + * inv_id锁定单据标识 + * inv_code锁定单据编码 + * } + */ + void updateStructAndPoint(JSONObject from); +} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/InbillServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/InbillServiceImpl.java new file mode 100644 index 000000000..b07bd4285 --- /dev/null +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/InbillServiceImpl.java @@ -0,0 +1,316 @@ +package org.nl.wms.st.inbill.service.impl; + +import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.IdUtil; +import cn.hutool.core.util.NumberUtil; +import cn.hutool.core.util.StrUtil; +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.nl.modules.common.exception.BadRequestException; +import org.nl.modules.common.utils.SecurityUtils; +import org.nl.modules.wql.core.bean.WQLObject; +import org.nl.wms.st.inbill.service.StorPublicService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.HashMap; + +/** + * PC端出入库新增 + */ +@Service +@RequiredArgsConstructor +@Slf4j +public class InbillServiceImpl { + + private final StorPublicService storPublicService; + + //插入分配表 + public void insertDis(JSONObject jo) { + WQLObject dis = WQLObject.getWQLObject("ST_IVT_IOStorInvDis"); + JSONObject dis_jo = new JSONObject(); + dis_jo.put("iostorinvdisdtl_id", IdUtil.getSnowflake(1, 1).nextId()); + dis_jo.put("iostorinvdis_id", jo.getString("iostorinvdis_id")); + dis_jo.put("iostorinv_id", jo.getString("iostorinv_id")); + dis_jo.put("iostorinvdtl_id", jo.getString("iostorinvdtl_id")); + JSONArray dis_rows = dis.query("iostorinvdtl_id = '" + jo.getString("iostorinvdtl_id") + "'").getResultJSONArray(0); + dis_jo.put("seq_no", (dis_rows.size() + 1) + ""); + dis_jo.put("sect_id", jo.getString("sect_id")); + dis_jo.put("sect_code", jo.getString("sect_code")); + dis_jo.put("sect_name", jo.getString("sect_name")); + dis_jo.put("struct_id", jo.getString("struct_id")); + dis_jo.put("struct_code", jo.getString("struct_code")); + dis_jo.put("struct_name", jo.getString("struct_name")); + dis_jo.put("material_id", jo.getString("material_id")); + dis_jo.put("pcsn", jo.getString("pcsn")); + dis_jo.put("quality_scode", jo.getString("quality_scode")); + dis_jo.put("ivt_level", jo.getString("ivt_level")); + dis_jo.put("is_active", jo.getString("is_active")); + dis_jo.put("is_active", jo.getString("is_active")); + dis_jo.put("work_status", "00"); + dis_jo.put("storagevehicle_id", jo.getString("storagevehicle_id")); + dis_jo.put("storagevehicle_type", jo.getString("storagevehicle_type")); + dis_jo.put("storagevehicle_code", jo.getString("storagevehicle_code")); + dis_jo.put("is_issued", "0"); + dis_jo.put("qty_unit_id", jo.getString("qty_unit_id")); + dis_jo.put("qty_unit_name", jo.getString("qty_unit_name")); + dis_jo.put("plan_qty", "0"); + dis_jo.put("point_id", jo.getString("point_id")); + dis_jo.put("point_code", jo.getString("point_code")); + dis_jo.put("point_name", jo.getString("point_name")); + dis.insert(dis_jo); + } + + //插入分配明细表 + public void insertDisDtl(JSONObject jo) { + WQLObject dis_dtl = WQLObject.getWQLObject("ST_IVT_IOStorInvDisDtl"); + JSONObject disdtl_jo = new JSONObject(); + disdtl_jo.put("iostorinvdisdtl_id", IdUtil.getSnowflake(1, 1).nextId()); + disdtl_jo.put("iostorinvdis_id", jo.getString("iostorinvdis_id")); + disdtl_jo.put("iostorinv_id", jo.getString("iostorinv_id")); + disdtl_jo.put("iostorinvdtl_id", jo.getString("iostorinvdtl_id")); + disdtl_jo.put("seq_no", jo.getString("seq_no")); + disdtl_jo.put("sect_id", jo.getString("sect_id")); + disdtl_jo.put("sect_code", jo.getString("sect_code")); + disdtl_jo.put("sect_name", jo.getString("sect_name")); + disdtl_jo.put("struct_id", jo.getString("struct_id")); + disdtl_jo.put("struct_code", jo.getString("struct_code")); + disdtl_jo.put("struct_name", jo.getString("struct_name")); + disdtl_jo.put("material_id", jo.getString("material_id")); + disdtl_jo.put("pcsn", jo.getString("pcsn")); + disdtl_jo.put("quality_scode", jo.getString("quality_scode")); + disdtl_jo.put("ivt_level", jo.getString("ivt_level")); + disdtl_jo.put("is_active", jo.getString("is_active")); + disdtl_jo.put("storagevehicle_id", jo.getString("storagevehicle_id")); + disdtl_jo.put("storagevehicle_code", jo.getString("storagevehicle_code")); + disdtl_jo.put("storagevehicle_type", jo.getString("storagevehicle_type")); + disdtl_jo.put("bucketunique", jo.getString("bucketunique")); + disdtl_jo.put("qty_unit_id", jo.getString("qty_unit_id")); + disdtl_jo.put("qty_unit_name", jo.getString("qty_unit_name")); + disdtl_jo.put("real_qty", jo.getString("storage_qty")); + dis_dtl.insert(disdtl_jo); + + //回写分配表数量 + double real_qty = disdtl_jo.getDoubleValue("real_qty"); + JSONObject dis = WQLObject.getWQLObject("ST_IVT_IOStorInvDis").query("iostorinvdis_id ='" + jo.getString("iostorinvdis_id") + "'").uniqueResult(0); + dis.put("plan_qty", dis.getDoubleValue("plan_qty") + real_qty); + WQLObject.getWQLObject("ST_IVT_IOStorInvDis").update(dis); + + //回写明细表数量 + JSONObject dtl = WQLObject.getWQLObject("ST_IVT_IOStorInvDtl").query("iostorinvdtl_id ='" + jo.getString("iostorinvdtl_id") + "'").uniqueResult(0); + dtl.put("assign_qty", dtl.getDoubleValue("assign_qty") + real_qty); + double unassign_qty = dtl.getDoubleValue("unassign_qty") - real_qty; + if (unassign_qty < 0) { + unassign_qty = 0; + } + dtl.put("unassign_qty", unassign_qty); + dtl.put("bill_status", "30"); + WQLObject.getWQLObject("ST_IVT_IOStorInvDtl").update(dtl); + + //更新主表状态 + JSONObject mst = WQLObject.getWQLObject("ST_IVT_IOStorInv").query("iostorinv_id ='" + jo.getString("iostorinv_id") + "'").uniqueResult(0); + JSONArray dtl_rows = WQLObject.getWQLObject("ST_IVT_IOStorInvDtl").query("iostorinv_id = '" + jo.getString("iostorinv_id") + "' AND bill_status IN ('20','30')").getResultJSONArray(0); + mst.put("bill_status", "30"); + WQLObject.getWQLObject("ST_IVT_IOStorInv").update(mst); + } + + public void operatePoint(String operate, JSONObject form) { + WQLObject point_table = WQLObject.getWQLObject("SCH_BASE_Point"); + WQLObject struct_table = WQLObject.getWQLObject("ST_IVT_StructAttr"); + String end_point = form.getString("end_point"); + HashMap map = new HashMap<>(); + //operate:0生成、1完成、2单据确认 + switch (operate) { + case "0": + //锁定终点 + //锁定单据信息 + map.put("lock_type", "01"); + map.put("inv_type", form.getString("inv_type")); + map.put("inv_id", form.getString("inv_id")); + map.put("inv_code", form.getString("inv_code")); + point_table.update(map, "point_code = '" + end_point + "'"); + struct_table.update(map, "struct_code = '" + end_point + "'"); + break; + case "1": + break; + case "2": + //解锁终点,绑定载具 + String vehicle_code = form.getString("vehicle_code"); + String storagevehicle_id = form.getString("storagevehicle_id"); + String storagevehicle_type = form.getString("storagevehicle_type"); + map.put("lock_type", "00"); + map.put("point_status", "02"); + map.put("vehicle_code", vehicle_code); + map.put("taskdtl_type", ""); + map.put("taskdtl_id", ""); + map.put("task_code", ""); + map.put("inv_type", ""); + map.put("inv_id", ""); + map.put("inv_code", ""); + point_table.update(map, "point_code = '" + end_point + "'"); + HashMap struct_map = new HashMap<>(); + struct_map.put("storagevehicle_id", storagevehicle_id); + struct_map.put("lock_type", "00"); + struct_map.put("storagevehicle_code", vehicle_code); + struct_map.put("storagevehicle_type", storagevehicle_type); + struct_map.put("taskdtl_type", ""); + struct_map.put("taskdtl_id", ""); + struct_map.put("task_code", ""); + struct_map.put("inv_type", ""); + struct_map.put("inv_id", ""); + struct_map.put("inv_code", ""); + struct_table.update(struct_map, "struct_code = '" + end_point + "'"); + break; + } + } + + @Transactional(rollbackFor = Exception.class) + public void confirmDis(JSONObject form) { + WQLObject dis_table = WQLObject.getWQLObject("ST_IVT_IOStorInvDis"); + WQLObject dtl_table = WQLObject.getWQLObject("ST_IVT_IOStorInvDtl"); + WQLObject pcs_if_purchaseorderproc = WQLObject.getWQLObject("pcs_if_purchaseorderproc"); + String task_id = form.getString("task_id"); + + if (StrUtil.isEmpty(task_id)) { + throw new BadRequestException("任务标识为空！"); + } + + JSONArray dis_rows = dis_table.query("task_id = '" + task_id + "'").getResultJSONArray(0); + //回写入库分配表实际数量 + for (int i = 0; i < dis_rows.size(); i++) { + JSONObject dis_row = dis_rows.getJSONObject(i); + dis_row.put("work_status", "99"); + dis_row.put("real_qty", dis_row.getString("plan_qty")); + dis_table.update(dis_row); + + //回写明细表实际数量 + JSONObject dtl_row = dtl_table.query("iostorinvdtl_id = '" + dis_row.getString("iostorinvdtl_id") + "'").uniqueResult(0); + double real_qty = NumberUtil.add(dtl_row.getDoubleValue("real_qty"), dis_row.getDoubleValue("real_qty")); + + //该明细下的所有分配明细都执行完成且未分配数=0，将明细变为99 + JSONArray unfinish_dis = dis_table.query("iostorinvdtl_id = '" + dis_row.getString("iostorinvdtl_id") + "' AND work_status < '99'").getResultJSONArray(0); + if (dtl_row.getDoubleValue("unassign_qty") == 0 && unfinish_dis.size() <= 0) { + dtl_row.put("bill_status", "99"); + } + dtl_row.put("real_qty", real_qty); + dtl_table.update(dtl_row); + + //判断是否为软废采购入库，修改采购入库单 + JSONObject mst_jo = WQLObject.getWQLObject("ST_IVT_IOStorInv").query("iostorinv_id = '" + dis_row.getString("iostorinv_id") + "'").uniqueResult(0); + if (mst_jo.getString("bill_type").equals("000202")) { + String bill_id = dtl_row.getString("base_billdtl_id"); + JSONArray bill_rows = WQLObject.getWQLObject("ST_IVT_IOStorInvDtl").query("base_billdtl_id = '" + bill_id + "' AND bill_status < '99'").getResultJSONArray(0); + if (bill_rows.size() == 0) { + HashMap bill_map = new HashMap<>(); + bill_map.put("proc_status", "09"); + pcs_if_purchaseorderproc.update(bill_map, "id = '" + bill_id + "'"); + } + } + + //判断主表是否改为完成 + JSONArray dtl_rows = dtl_table.query("iostorinv_id = '" + dtl_row.getString("iostorinv_id") + "' AND bill_status < '99'").getResultJSONArray(0); + if (dtl_rows.size() == 0) { + JSONObject data = new JSONObject(); + data.put("iostorinv_id", dtl_row.getString("iostorinv_id")); + this.confirmMst(data); + } + } + } + + public void confirmMst(JSONObject from) { + WQLObject dtl_table = WQLObject.getWQLObject("ST_IVT_IOStorInvDtl"); + WQLObject dis_table = WQLObject.getWQLObject("ST_IVT_IOStorInvDis"); + WQLObject bucket_table = WQLObject.getWQLObject("md_pb_bucketrecord"); + WQLObject reMstTab = WQLObject.getWQLObject("PCS_RC_ReceiveMst"); //到货通知单主表 + WQLObject reDtlTab = WQLObject.getWQLObject("PCS_RC_ReceiveDtl"); //到货通知单明细表 + WQLObject procTab = WQLObject.getWQLObject("PCS_IF_PurchaseOrderProc"); //采购订单接口处理表 + WQLObject dtlTab = WQLObject.getWQLObject("QL_TEST_InspectionSheetDtl"); //质检单明细表 + String iostorinv_id = from.getString("iostorinv_id"); + + Long currentUserId = SecurityUtils.getCurrentUserId(); + String nickName = SecurityUtils.getCurrentNickName(); + String now = DateUtil.now(); + + JSONObject mst_jo = WQLObject.getWQLObject("ST_IVT_IOStorInv").query("iostorinv_id = '" + iostorinv_id + "'").uniqueResult(0); + + String bill_type = mst_jo.getString("bill_type"); + + //查询 + JSONArray dtl_rows = dtl_table.query("iostorinv_id = '" + iostorinv_id + "' AND bill_status < '99'").getResultJSONArray(0); + + if (dtl_rows.size() > 0) { + throw new BadRequestException("主表下存在未完成的明细！"); + } + + //更新目的点位，仓位、加库存 + JSONArray dis_rows = dis_table.query("iostorinv_id = '" + iostorinv_id + "'").getResultJSONArray(0); + for (int i = 0; i < dis_rows.size(); i++) { + JSONObject dis_row = dis_rows.getJSONObject(i); + JSONObject point_form = new JSONObject(); + point_form.put("end_point", dis_row.getString("struct_code")); + point_form.put("vehicle_code", dis_row.getString("storagevehicle_code")); + point_form.put("storagevehicle_id", dis_row.getString("storagevehicle_id")); + point_form.put("storagevehicle_type", dis_row.getString("storagevehicle_type")); + //更新目的点位 + this.operatePoint("2", point_form); + + //加库存 + JSONObject i_form = new JSONObject(); + i_form.put("struct_id", dis_row.getString("struct_id")); + i_form.put("material_id", dis_row.getString("material_id")); + i_form.put("quality_scode", dis_row.getString("quality_scode")); + i_form.put("pcsn", dis_row.getString("pcsn")); + i_form.put("ivt_level", dis_row.getString("ivt_level")); + i_form.put("is_active", dis_row.getString("is_active")); + i_form.put("change_qty", dis_row.getString("plan_qty")); + i_form.put("bill_type_scode", mst_jo.getString("bill_type")); + i_form.put("inv_id", mst_jo.getString("iostorinv_id")); + i_form.put("bill_code", mst_jo.getString("bill_code")); + i_form.put("bill_table", "ST_IVT_IOStorInv"); + i_form.put("qty_unit_id", dis_row.getString("qty_unit_id")); + i_form.put("qty_unit_name", dis_row.getString("qty_unit_name")); + storPublicService.IOStor(i_form, "33"); + + //更新桶记录表 + HashMap bucket_map = new HashMap(); + bucket_map.put("status", "03"); + bucket_map.put("instor_optid", currentUserId); + bucket_map.put("instor_optname", nickName); + bucket_map.put("instor_time", now); + bucket_table.update(bucket_map, "storagevehicle_code = '" + dis_row.getString("storagevehicle_code") + "' AND status = '02'"); + + //如果单据为原辅料入库，且为寄样合格，回写到货通知单 + + } + mst_jo.put("bill_status", "99"); + mst_jo.put("confirm_optid", currentUserId); + mst_jo.put("confirm_optname", nickName); + mst_jo.put("confirm_time", now); + if("000101".equals(bill_type)){ + //查询 + dtl_rows = dtl_table.query("iostorinv_id = '" + iostorinv_id + "' AND bill_status = '99'").getResultJSONArray(0); + + for(int i=0; i pageQuery(Map whereJson, Pageable page) { + HashMap map = new HashMap<>(); + map.put("flag", "1"); + map.put("buss_type", (String) whereJson.get("buss_type")); + map.put("stor_id", (String) whereJson.get("stor_id")); + map.put("bill_type", (String) whereJson.get("bill_type")); + map.put("create_mode", (String) whereJson.get("create_mode")); + map.put("bill_status", (String) whereJson.get("bill_status")); + String bill_code = MapUtil.getStr(whereJson, "bill_code"); + if (!ObjectUtil.isEmpty(bill_code)) { + map.put("bill_code", "%" + bill_code + "%"); + } + String begin_time = (String) whereJson.get("begin_time"); + + if (!StrUtil.isEmpty(begin_time)) { + map.put("begin_time", begin_time); + } + String end_time = (String) whereJson.get("end_time"); + if (!StrUtil.isEmpty(end_time)) { + map.put("end_time", end_time); + } + + JSONObject jo = WQL.getWO("QST_IVT_RAWASSISTISTOR").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "input_time desc"); + return jo; + } + + @Override + public JSONArray getType(Map whereJson) { + return null; + } + + @Override + public Map getBillDtl(Map whereJson, Pageable page) { + HashMap map = new HashMap<>(); + String bill_code = (String) whereJson.get("bill_code"); + String material_search = (String) whereJson.get("material_search"); + String begin_time = (String) whereJson.get("begin_time"); + String end_time = (String) whereJson.get("end_time"); + String container_name = (String) whereJson.get("container_name"); + String package_box_sn = (String) whereJson.get("package_box_sn"); + map.put("flag", "2"); + if (StrUtil.isNotEmpty(package_box_sn)) { + map.put("package_box_sn", package_box_sn); + } + if (StrUtil.isNotEmpty(container_name)) { + map.put("container_name", container_name); + } + if (StrUtil.isNotEmpty(bill_code)) { + map.put("bill_code", bill_code); + } + if (StrUtil.isNotEmpty(material_search)) { + map.put("material_search", "%" + material_search + "%"); + } + if (StrUtil.isNotEmpty(begin_time)) { + map.put("begin_time", begin_time); + map.put("end_time", end_time); + } + JSONObject jo = WQL.getWO("QST_IVT_RAWASSISTISTOR").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "date_of_FG_inbound,package_box_sn desc"); + return jo; + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void insertDtl(Map whereJson) { + ArrayList rows = (ArrayList) whereJson.get("tableData"); + Long currentUserId = SecurityUtils.getCurrentUserId(); + String nickName = SecurityUtils.getCurrentNickName(); + String now = DateUtil.now(); + JSONObject io_mst = new JSONObject(); + String iostorinv_id = IdUtil.getSnowflake(1, 1).nextId() + ""; + String bill_code = CodeUtil.getNewCode("IO_CODE"); + io_mst.put("iostorinv_id", iostorinv_id); + io_mst.put("bill_code", bill_code); + io_mst.put("buss_type", ((String) whereJson.get("bill_type")).substring(0, 4)); + io_mst.put("io_type", "0"); + io_mst.put("bill_type", whereJson.get("bill_type")); + io_mst.put("biz_date", whereJson.get("biz_date").toString().substring(0, 10)); + StorattrDto storattrDto = storattrService.findById(Long.parseLong((String) whereJson.get("stor_id"))); + String stor_code = storattrDto.getStor_code(); + String stor_name = storattrDto.getStor_name(); + io_mst.put("stor_id", whereJson.get("stor_id")); + io_mst.put("stor_code", stor_code); + io_mst.put("stor_name", stor_name); + io_mst.put("total_qty", whereJson.get("total_qty")); + io_mst.put("detail_count", whereJson.get("detail_count")); + io_mst.put("remark", whereJson.get("remark")); + io_mst.put("bill_status", whereJson.get("bill_status")); + io_mst.put("create_mode", "01"); + io_mst.put("input_optid", currentUserId + ""); + io_mst.put("input_optname", nickName); + io_mst.put("input_time", now); + io_mst.put("update_optid", currentUserId + ""); + io_mst.put("update_optname", nickName); + io_mst.put("update_time", now); + io_mst.put("is_delete", "0"); + io_mst.put("is_upload", "0"); + Long deptId = SecurityUtils.getDeptId(); + io_mst.put("sysdeptid", deptId + ""); + io_mst.put("syscompanyid", deptId + ""); + + for (int i = 0; i < rows.size(); i++) { + HashMap row = rows.get(i); + row.put("iostorinvdtl_id", IdUtil.getSnowflake(1, 1).nextId() + ""); + row.put("iostorinv_id", iostorinv_id); + row.put("seq_no", (i + 1) + ""); + JSONObject material = WQLObject.getWQLObject("md_me_materialbase").query("material_code = '" + row.get("product_name") + "'").uniqueResult(0); + row.put("material_id", material.getString("material_id")); + row.put("pcsn", row.get("container_name")); + row.put("bill_status", "30"); + row.put("qty_unit_id", "1"); + row.put("qty_unit_name", "KG"); + row.put("assign_qty", row.get("net_weight")); + row.put("plan_qty", row.get("net_weight")); + row.put("box_no", row.get("package_box_sn")); + + WQLObject.getWQLObject("ST_IVT_IOStorInvDtl").insert(row); + + JSONObject dis = new JSONObject(); + dis.put("iostorinvdis_id", IdUtil.getSnowflake(1, 1).nextId() + ""); + dis.put("iostorinv_id", iostorinv_id); + dis.put("iostorinvdtl_id", row.get("iostorinvdtl_id")); + dis.put("seq_no", 1); + dis.put("material_id", row.get("material_id")); + dis.put("pcsn", row.get("pcsn")); + dis.put("box_no", row.get("box_no")); + dis.put("quality_scode", row.get("quality_scode")); + dis.put("work_status", "00"); + dis.put("qty_unit_id", "1"); + dis.put("qty_unit_name", "KG"); + dis.put("plan_qty", row.get("plan_qty")); + WQLObject.getWQLObject("ST_IVT_IOStorInvDis").insert(dis); + + //将包装关系中对应的记录状态改为包装 + HashMap map = new HashMap<>(); + map.put("status", "1"); + WQLObject.getWQLObject("PDM_BI_SubPackageRelation").update(map, "package_box_SN = '" + dis.getString("box_no") + "' AND status = '0'"); + } + WQLObject.getWQLObject("ST_IVT_IOStorInv").insert(io_mst); + } + + @Override + public void deleteAll(Long[] ids) { + Long currentUserId = SecurityUtils.getCurrentUserId(); + String nickName = SecurityUtils.getCurrentNickName(); + String now = DateUtil.now(); + + WQLObject wo = WQLObject.getWQLObject("ST_IVT_IOStorInv"); + for (Long id : ids) { + JSONObject param = new JSONObject(); + param.put("iostorinv_id", String.valueOf(id)); + param.put("is_delete", "1"); + param.put("update_optid", currentUserId); + param.put("update_optname", nickName); + param.put("update_time", now); + wo.update(param); + + JSONArray rows = WQLObject.getWQLObject("ST_IVT_IOStorInvDtl").query("iostorinv_id = '" + String.valueOf(id) + "'").getResultJSONArray(0); + for (int i = 0; i < rows.size(); i++) { + JSONObject row = rows.getJSONObject(i); + String box_no = row.getString("box_no"); + //将状态为包装的改为生成 + HashMap map = new HashMap<>(); + map.put("status", "0"); + WQLObject.getWQLObject("PDM_BI_SubPackageRelation").update(map, "package_box_SN = '" + box_no + "' AND status = '1'"); + WQLObject.getWQLObject("ST_IVT_IOStorInvDtl").delete(row); + } + } + } + + @Override + public void update(Map whereJson) { + JSONObject mst_jo = WQLObject.getWQLObject("ST_IVT_IOStorInv").query("iostorinv_id = '" + whereJson.get("iostorinv_id") + "'").uniqueResult(0); + if (!mst_jo.getString("bill_status").equals("10")) { + throw new BadRequestException("主表状态必须为生成！"); + } + Long currentUserId = SecurityUtils.getCurrentUserId(); + String nickName = SecurityUtils.getCurrentNickName(); + + String now = DateUtil.now(); + whereJson.put("update_optid", currentUserId + ""); + whereJson.put("update_optname", nickName); + whereJson.put("update_time", now); + + WQLObject wo = WQLObject.getWQLObject("ST_IVT_IOStorInv"); + WQLObject wo_dtl = WQLObject.getWQLObject("ST_IVT_IOStorInvDtl"); + wo.update(whereJson); + //先删除该单据下的所有明细 + String iostorinv_id = (String) whereJson.get("iostorinv_id"); + wo_dtl.delete("iostorinv_id = '" + iostorinv_id + "'"); + ArrayList rows = (ArrayList) whereJson.get("tableData"); + for (int i = 0; i < rows.size(); i++) { + HashMap row = rows.get(i); + row.put("iostorinvdtl_id", IdUtil.getSnowflake(1, 1).nextId() + ""); + row.put("iostorinv_id", iostorinv_id); + row.put("seq_no", (i + 1) + ""); + row.put("bill_status", "10"); + row.put("unassign_qty", row.get("plan_qty")); + WQLObject.getWQLObject("ST_IVT_IOStorInvDtl").insert(row); + + //如果生成的入库单为软废采购入库需要将采购订单接口处理表改为采购中 + if (whereJson.get("bill_type").equals("000202")) { + HashMap proc_map = new HashMap<>(); + proc_map.put("proc_status", "02"); + proc_map.put("update_optid", currentUserId + ""); + proc_map.put("update_optname", nickName); + proc_map.put("update_time", now); + WQLObject.getWQLObject("PCS_IF_PurchaseOrderProc").update(proc_map, "id = '" + row.get("base_billdtl_id") + "'"); + } + } + } + + @Override + public void commit(Map whereJson) { + String iostorinv_id = (String) whereJson.get("iostorinv_id"); + JSONObject mst = WQLObject.getWQLObject("ST_IVT_IOStorInv").query("iostorinv_id = '" + iostorinv_id + "'").uniqueResult(0); + if (!mst.getString("bill_status").equals("10")) { + throw new BadRequestException("请选择单据状态为生成的进行提交！"); + } + HashMap map = new HashMap<>(); + map.put("bill_status", "20"); + Long currentUserId = SecurityUtils.getCurrentUserId(); + String nickName = SecurityUtils.getCurrentNickName(); + + String now = DateUtil.now(); + map.put("update_optid", currentUserId + ""); + map.put("update_optname", nickName); + map.put("update_time", now); + WQLObject.getWQLObject("ST_IVT_IOStorInv").update(map, "iostorinv_id = '" + iostorinv_id + "'"); + WQLObject.getWQLObject("ST_IVT_IOStorInvDtl").update(map, "iostorinv_id = '" + iostorinv_id + "'"); + } + + @Override + public JSONArray getIODtl(Map whereJson) { + String id = (String) whereJson.get("bill_code"); + String open_flag = (String) whereJson.get("open_flag"); + JSONArray ja = WQL.getWO("QST_IVT_RAWASSISTISTOR").addParam("flag", "3").addParam("bill_code", id) + .addParam("open_flag", open_flag).process().getResultJSONArray(0); + return ja; + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void confirmvehicle(Map whereJson) { + WQLObject change = WQLObject.getWQLObject("MD_PB_BucketChangeFlow"); + String storagevehicle_code = (String) whereJson.get("storagevehicle_code"); + if (StrUtil.isEmpty(storagevehicle_code)) { + throw new BadRequestException("载具号不能为空！"); + } + + //判断该载具是否已经分配货位或者起点 + JSONArray dis_rows = WQLObject.getWQLObject("st_ivt_iostorinvdis").query("storagevehicle_code = '" + storagevehicle_code + "' AND work_status < '99' AND ((struct_id <> '' AND struct_id is not null) OR (point_id <> '' AND point_code is not null))").getResultJSONArray(0); + if (dis_rows.size() > 0) { + throw new BadRequestException("该载具已经分配货位或起点，无法继续组盘！"); + } + + + HashMap dtl = (HashMap) whereJson.get("dtl_row"); + ArrayList rows = (ArrayList) whereJson.get("tableMater"); + + Long currentUserId = SecurityUtils.getCurrentUserId(); + String nickName = SecurityUtils.getCurrentNickName(); + String now = DateUtil.now(); + + //插入入库分配表 + StoragevehicleinfoDto vehicle = null; + String iostorinvdis_id = ""; + + //判断该明细是否存在分配 + JSONObject dis_row = WQLObject.getWQLObject("ST_IVT_IOStorInvDis").query("iostorinvdtl_id = '" + dtl.get("iostorinvdtl_id") + "' AND storagevehicle_code = '" + vehicle.getStoragevehicle_code() + "'").uniqueResult(0); + if (ObjectUtil.isEmpty(dis_row)) { + iostorinvdis_id = IdUtil.getSnowflake(1, 1).nextId() + ""; + dtl.put("iostorinvdis_id", iostorinvdis_id); + dtl.put("storagevehicle_id", vehicle.getStoragevehicle_id() + ""); + dtl.put("storagevehicle_code", vehicle.getStoragevehicle_code()); + dtl.put("storagevehicle_type", vehicle.getStoragevehicle_type()); + + + /*//判断入库点是否冲突 + JSONObject point_row = WQLObject.getWQLObject("ST_IVT_IOStorInvDis").query("iostorinv_id = '" + dtl.get("iostorinv_id") + "' AND storagevehicle_code = '" + vehicle.getStoragevehicle_code() + "'").uniqueResult(0); + if (!ObjectUtil.isEmpty(point_row) && !point_row.getString("point_code").equals((String) whereJson.get("point_code"))) { + throw new BadRequestException("该载具入库点冲突，请重新选择"); + } + PointDto pointDto = pointService.findByCode((String) whereJson.get("point_code")); + dtl.put("point_code", pointDto.getPoint_code()); + dtl.put("point_id", pointDto.getPoint_id() + ""); + dtl.put("point_name", pointDto.getPoint_name());*/ + inbillService.insertDis(JSONObject.parseObject(JSON.toJSONString(dtl))); + } else { + iostorinvdis_id = dis_row.getString("iostorinvdis_id"); + } + //组盘校验 + //判断该桶是否已经被操作 + for (int i = 0; i < rows.size(); i++) { + HashMap row = rows.get(i); + if (StrUtil.isEmpty(row.get("bucket_record_id"))) { + continue; + } + JSONObject bucket_jo = WQLObject.getWQLObject("MD_PB_BucketRecord").query("bucket_record_id = '" + row.get("bucket_record_id") + "'").uniqueResult(0); + if (bucket_jo == null) { + throw new BadRequestException("桶号：" + row.get("bucketunique") + "不存在，请重新选择！"); + } else { + if (!bucket_jo.getString("status").equals("01")) { + throw new BadRequestException("桶号：" + row.get("bucketunique") + "已经被操作，请重新选择！"); + } + } + + //原来页面可以修改放入重量，经过讨论不修改，不需要动桶变动记录表 + + //判断是否为工序返工入库 + JSONObject mst_jo = WQLObject.getWQLObject("ST_IVT_IOStorInv").query("iostorinv_id = '" + dtl.get("iostorinv_id") + "'").uniqueResult(0); + //更新桶记录表 + HashMap bucket_map = new HashMap<>(); + bucket_map.put("status", "02"); + bucket_map.put("makeup_optid", currentUserId + ""); + bucket_map.put("makeup_optname", nickName); + bucket_map.put("makeup_time", now); + bucket_map.put("storagevehicle_id", vehicle.getStoragevehicle_id() + ""); + bucket_map.put("storagevehicle_code", vehicle.getStoragevehicle_code()); + if (mst_jo.getString("bill_type").equals("000302")) { + bucket_map.put("quality_scode", "02"); + row.put("quality_scode", "02"); + } + WQLObject.getWQLObject("MD_PB_BucketRecord").update(bucket_map, "bucket_record_id = '" + row.get("bucket_record_id") + "'"); + + //插入分配明细表 + row.put("iostorinvdis_id", iostorinvdis_id); + row.put("iostorinv_id", dtl.get("iostorinv_id")); + row.put("iostorinvdtl_id", dtl.get("iostorinvdtl_id")); + row.put("storagevehicle_id", vehicle.getStoragevehicle_id() + ""); + row.put("storagevehicle_code", vehicle.getStoragevehicle_code()); + row.put("storagevehicle_type", vehicle.getStoragevehicle_type()); + row.put("seq_no", (i + 1) + ""); + inbillService.insertDisDtl(JSONObject.parseObject(JSON.toJSONString(row))); + + JSONObject bucket_now = WQLObject.getWQLObject("MD_PB_BucketRecord").query("bucketunique = '" + row.get("bucketunique") + "' AND status = '02'").uniqueResult(0); + if (mst_jo.getString("bill_type").equals("000302")) { + //插入桶物料变动记录表，减待检 + JSONObject change_jo = new JSONObject(); + change_jo.put("change_id", IdUtil.getSnowflake(1, 1).nextId()); + change_jo.put("bucket_code", bucket_now.get("bucketunique")); + change_jo.put("material_id", bucket_now.get("material_id")); + change_jo.put("pcsn", bucket_now.get("pcsn")); + change_jo.put("ivt_level", bucket_now.get("ivt_level")); + change_jo.put("is_active", bucket_now.get("is_active")); + change_jo.put("quality_scode", "00"); + change_jo.put("qty_unit_id", bucket_now.get("qty_unit_id")); + change_jo.put("qty_unit_name", bucket_now.get("qty_unit_name")); + change_jo.put("change_type_scode", "02"); + change_jo.put("change_time", now); + change_jo.put("rec_person", currentUserId); + change_jo.put("change_qty", bucket_now.get("storage_qty")); + change_jo.put("result_qty", "0"); + change.insert(change_jo); + + //插入桶物料变动记录表，加不良 + JSONObject change_jo2 = new JSONObject(); + change_jo2.put("change_id", IdUtil.getSnowflake(1, 1).nextId()); + change_jo2.put("bucket_code", bucket_now.get("bucketunique")); + change_jo2.put("material_id", bucket_now.get("material_id")); + change_jo2.put("pcsn", bucket_now.get("pcsn")); + change_jo2.put("ivt_level", bucket_now.get("ivt_level")); + change_jo2.put("is_active", bucket_now.get("is_active")); + change_jo2.put("quality_scode", "02"); + change_jo2.put("qty_unit_id", bucket_now.get("qty_unit_id")); + change_jo2.put("qty_unit_name", bucket_now.get("qty_unit_name")); + change_jo2.put("change_type_scode", "01"); + change_jo2.put("change_time", now); + change_jo2.put("rec_person", currentUserId); + change_jo2.put("change_qty", bucket_now.get("storage_qty")); + change_jo2.put("result_qty", bucket_now.get("storage_qty")); + change.insert(change_jo2); + } + } + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void deleteDisDtl(Map row) { + WQLObject change = WQLObject.getWQLObject("MD_PB_BucketChangeFlow"); + Long currentUserId = SecurityUtils.getCurrentUserId(); + String nickName = SecurityUtils.getCurrentNickName(); + String now = DateUtil.now(); + WQLObject dis_dtl = WQLObject.getWQLObject("ST_IVT_IOStorInvDisDtl"); + JSONObject dis = WQLObject.getWQLObject("ST_IVT_IOStorInvDis").query("iostorinvdis_id ='" + row.get("iostorinvdis_id") + "'").uniqueResult(0); + if (StrUtil.isNotEmpty(dis.getString("struct_id"))) { + throw new BadRequestException("该桶已经分配货位，请先取消分配再删除桶！"); + } + dis_dtl.delete("iostorinvdisdtl_id = '" + (String) row.get("iostorinvdisdtl_id") + "'"); + JSONObject mst = WQLObject.getWQLObject("ST_IVT_IOStorInv").query("iostorinv_id ='" + row.get("iostorinv_id") + "'").uniqueResult(0); + //更新桶记录表 + HashMap bucket_map = new HashMap<>(); + bucket_map.put("status", "01"); + bucket_map.put("makeup_optid", ""); + bucket_map.put("makeup_optname", ""); + bucket_map.put("makeup_time", ""); + bucket_map.put("storagevehicle_id", ""); + bucket_map.put("storagevehicle_code", ""); + if (mst.getString("bill_type").equals("000302")) { + bucket_map.put("quality_scode", "00"); + } + WQLObject.getWQLObject("MD_PB_BucketRecord").update(bucket_map, "bucketunique = '" + row.get("bucketunique") + "' AND status = '02'"); + + JSONObject bucket_now = WQLObject.getWQLObject("MD_PB_BucketRecord").query("bucketunique = '" + row.get("bucketunique") + "' AND status = '01'").uniqueResult(0); + if (mst.getString("bill_type").equals("000302")) { + //插入桶物料变动记录表，加待检 + JSONObject change_jo = new JSONObject(); + change_jo.put("change_id", IdUtil.getSnowflake(1, 1).nextId()); + change_jo.put("bucket_code", bucket_now.get("bucketunique")); + change_jo.put("material_id", bucket_now.get("material_id")); + change_jo.put("pcsn", bucket_now.get("pcsn")); + change_jo.put("ivt_level", bucket_now.get("ivt_level")); + change_jo.put("is_active", bucket_now.get("is_active")); + change_jo.put("quality_scode", "00"); + change_jo.put("qty_unit_id", bucket_now.get("qty_unit_id")); + change_jo.put("qty_unit_name", bucket_now.get("qty_unit_name")); + change_jo.put("change_type_scode", "01"); + change_jo.put("change_time", now); + change_jo.put("rec_person", currentUserId); + change_jo.put("change_qty", bucket_now.get("storage_qty")); + change_jo.put("result_qty", bucket_now.get("storage_qty")); + change.insert(change_jo); + + //插入桶物料变动记录表，减不良 + JSONObject change_jo2 = new JSONObject(); + change_jo2.put("change_id", IdUtil.getSnowflake(1, 1).nextId()); + change_jo2.put("bucket_code", bucket_now.get("bucketunique")); + change_jo2.put("material_id", bucket_now.get("material_id")); + change_jo2.put("pcsn", bucket_now.get("pcsn")); + change_jo2.put("ivt_level", bucket_now.get("ivt_level")); + change_jo2.put("is_active", bucket_now.get("is_active")); + change_jo2.put("quality_scode", "02"); + change_jo2.put("qty_unit_id", bucket_now.get("qty_unit_id")); + change_jo2.put("qty_unit_name", bucket_now.get("qty_unit_name")); + change_jo2.put("change_type_scode", "02"); + change_jo2.put("change_time", now); + change_jo2.put("rec_person", currentUserId); + change_jo2.put("change_qty", bucket_now.get("storage_qty")); + change_jo2.put("result_qty", "0"); + change.insert(change_jo2); + } + //回写分配表数量 + double real_qty = -Double.parseDouble((String) row.get("real_qty")); + if (NumberUtil.add(real_qty, dis.getDoubleValue("plan_qty")) <= 0) { + WQLObject.getWQLObject("ST_IVT_IOStorInvDis").delete(dis); + } else { + dis.put("plan_qty", (dis.getDoubleValue("plan_qty") + real_qty) + ""); + WQLObject.getWQLObject("ST_IVT_IOStorInvDis").update(dis); + } + //回写明细表数量 + JSONObject dtl = WQLObject.getWQLObject("ST_IVT_IOStorInvDtl").query("iostorinvdtl_id ='" + row.get("iostorinvdtl_id") + "'").uniqueResult(0); + double assign_qty = NumberUtil.add(dtl.getDoubleValue("assign_qty"), real_qty); + dtl.put("assign_qty", assign_qty); + double unassign_qty = dtl.getDoubleValue("plan_qty") - assign_qty; + if (unassign_qty < 0) { + unassign_qty = 0; + } + dtl.put("unassign_qty", unassign_qty + ""); + if (assign_qty > 0) { + dtl.put("bill_status", "30"); + } else { + dtl.put("bill_status", "10"); + } + WQLObject.getWQLObject("ST_IVT_IOStorInvDtl").update(dtl); + + //更新主表状态 + JSONArray dtl_rows = WQLObject.getWQLObject("ST_IVT_IOStorInvDtl").query("iostorinv_id = '" + row.get("iostorinv_id") + "' AND bill_status IN ('20','30')").getResultJSONArray(0); + if (dtl_rows.size() > 0) { + mst.put("bill_status", "30"); + } else { + mst.put("bill_status", "10"); + } + WQLObject.getWQLObject("ST_IVT_IOStorInv").update(mst); + } + + @Override + public JSONArray getDisDtl(Map whereJson) { + //查询该明细下的所有入库分配载具明细 + String iostorinv_id = (String) whereJson.get("iostorinv_id"); + JSONArray dis_rows = WQLObject.getWQLObject("ST_IVT_IOStorInvDis").query("iostorinvdtl_id = '" + whereJson.get("iostorinvdtl_id") + "' AND (task_id is null OR task_id = '')").getResultJSONArray(0); + JSONArray dis_dtl_rows = new JSONArray(); + HashSet vehicle_set = new HashSet<>(); + for (int j = 0; j < dis_rows.size(); j++) { + JSONObject dtl_row = dis_rows.getJSONObject(j); + vehicle_set.add(dtl_row.getString("box_no")); + } + for (String vehicle_code : vehicle_set) { + HashMap map = new HashMap<>(); + map.put("flag", "4"); + map.put("iostorinv_id", iostorinv_id); + map.put("package_box_sn", vehicle_code); + JSONArray dtl_rows = WQL.getWO("QST_IVT_RAWASSISTISTOR").addParamMap(map).process().getResultJSONArray(0); + dis_dtl_rows.addAll(dtl_rows); + } + return dis_dtl_rows; + } + + @Transactional(rollbackFor = Exception.class) + @Override + public void divStruct(Map whereJson) { + Long currentUserId = SecurityUtils.getCurrentUserId(); + String nickName = SecurityUtils.getCurrentNickName(); + String now = DateUtil.now(); + String sect_id = ""; + String sect_code = ""; + String sect_name = ""; + String struct_id = ""; + String struct_code = ""; + String struct_name = ""; + ArrayList rows = (ArrayList) whereJson.get("tableMater"); + JSONObject whereJson2 = JSONObject.parseObject(JSON.toJSONString(whereJson)); + HashMap map = rows.get(0); + + //判断该载具是否已经分配货位或者起点 + JSONArray now_dis_rows = WQLObject.getWQLObject("st_ivt_iostorinvdis").query("storagevehicle_code = '" + map.get("storagevehicle_code") + "' AND work_status < '99' AND (struct_id <> '' AND struct_id is not null)").getResultJSONArray(0); + if (now_dis_rows.size() > 0) { + throw new BadRequestException("该载具已经分配过货位，无法继续分配！"); + } + + String point_code = map.get("point_code"); + if (StrUtil.isNotEmpty(point_code)) { + HashMap point_map = new HashMap<>(); + PointDto pointDto = null; + 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 storagevehicle_code = '" + map.get("storagevehicle_code") + "'"); + } + + Boolean checked = whereJson2.getBoolean("checked"); + //是否分配货位 + if (ObjectUtil.isNotEmpty(checked) && checked) { + //自动分配一个货位 + MaterialbaseDto materialbaseDto = null; + Long material_type_id = materialbaseDto.getMaterial_type_id(); + BigDecimal height = materialbaseDto.getHeight(); + HashMap struct_map = new HashMap(); + if (StrUtil.isNotEmpty((String) whereJson.get("sect_id"))) { + struct_map.put("sect_id", (String) whereJson.get("sect_id")); + } + if (StrUtil.isNotEmpty((String) whereJson.get("stor_id"))) { + struct_map.put("stor_id", (String) whereJson.get("stor_id")); + } + //struct_map.put("height", height + ""); + struct_map.put("material_type_id", material_type_id + ""); + struct_map.put("flag", "7"); + JSONArray sect_rows = WQLObject.getWQLObject("st_ivt_structrelamaterial").query("material_type_id = '" + material_type_id + "'").getResultJSONArray(0); + if (sect_rows.size() > 0) { + struct_map.put("sect_flag", "1"); + } + JSONObject struct_jo = WQL.getWO("QST_IVT_RAWASSISTISTOR").addParamMap(struct_map).process().uniqueResult(0); + if (ObjectUtil.isEmpty(struct_jo)) { + throw new BadRequestException("未查询到适用仓位！"); + } + sect_id = struct_jo.getString("sect_id"); + sect_code = struct_jo.getString("sect_code"); + sect_name = struct_jo.getString("sect_name"); + struct_id = struct_jo.getString("struct_id"); + struct_code = struct_jo.getString("struct_code"); + struct_name = struct_jo.getString("struct_name"); + } else { + //更新入库分配表仓位相关字段 + sect_id = map.get("sect_id"); + sect_code = map.get("sect_code"); + sect_name = map.get("sect_name"); + struct_id = map.get("struct_id"); + struct_code = map.get("struct_code"); + struct_name = map.get("struct_name"); + } + HashMap dis_map = new HashMap(); + dis_map.put("sect_id", sect_id); + dis_map.put("sect_code", sect_code); + dis_map.put("sect_name", sect_name); + dis_map.put("struct_id", struct_id); + dis_map.put("struct_code", struct_code); + dis_map.put("struct_name", struct_name); + + //锁定货位 + JSONObject lock_map = new JSONObject(); + lock_map.put("end_point", struct_code); + //查询主表信息 + JSONObject mst = WQLObject.getWQLObject("st_ivt_iostorinv").query("iostorinv_id = '" + map.get("iostorinv_id") + "'").uniqueResult(0); + lock_map.put("inv_type", mst.get("bill_type")); + lock_map.put("inv_id", mst.get("iostorinv_id")); + lock_map.put("inv_code", mst.get("bill_code")); + inbillService.operatePoint("0", lock_map); + + //判断起点是否不为空 + JSONObject ios_dis = WQLObject.getWQLObject("ST_IVT_IOStorInvDis").query("iostorinv_id = '" + map.get("iostorinv_id") + "' AND storagevehicle_code = '" + map.get("storagevehicle_code") + "'").uniqueResult(0); + if (StrUtil.isNotEmpty(ios_dis.getString("point_code"))) { +// Boolean transfer = whereJson2.getBoolean("transfer",false); + Boolean transfer = whereJson2.getBoolean("transfer"); + if (ObjectUtil.isEmpty(transfer)) { + transfer = false; + } + + if (transfer) { + //创建任务 + AbstractAcsTask task = null; + JSONObject task_form = new JSONObject(); + task_form.put("task_type", "03"); + task_form.put("taskdtl_type", "04"); + task_form.put("start_point_code", map.get("point_code")); + task_form.put("next_point_code", struct_code); + task_form.put("storagevehicle_id", map.get("storagevehicle_id")); + task_form.put("vehicle_code", map.get("storagevehicle_code")); + task_form.put("storagevehicle_type", map.get("storagevehicle_type")); + task_form.put("task_id", map.get("task_id")); + String task_id = task.createTask(task_form); + dis_map.put("task_id", map.get("task_id")); + dis_map.put("work_status", "01"); + } else { + //创建任务 + AbstractAcsTask task = null; + JSONObject task_form = new JSONObject(); + task_form.put("task_type", "01"); + task_form.put("taskdtl_type", "01"); + task_form.put("start_device_code", map.get("point_code")); + task_form.put("next_device_code", struct_code); + task_form.put("storagevehicle_id", map.get("storagevehicle_id")); + task_form.put("vehicle_code", map.get("storagevehicle_code")); + task_form.put("storagevehicle_type", map.get("storagevehicle_type")); + String task_id = task.createTask(task_form); + if (whereJson.containsKey("auto_issue")) { + AbstractAcsTask intask = null; + //调用ACS接受任务接口 + JSONObject result = null; + if (ObjectUtil.isNotEmpty(result)) { + String status = result.getString("status"); + if ("200".equals(status)) { + HashMap mapnow = new HashMap<>(); + mapnow.put("task_status", "02"); + WQLObject.getWQLObject("SCH_BASE_Task").update(mapnow, "taskdtl_id = '" + task_id + "'"); + } else { + throw new BadRequestException("任务下发失败:" + result.getString("message")); + } + } + } + dis_map.put("task_id", task_id); + dis_map.put("work_status", "01"); + } + } + + WQLObject.getWQLObject("ST_IVT_IOStorInvDis").update(dis_map, "iostorinv_id = '" + map.get("iostorinv_id") + "' AND storagevehicle_code = '" + map.get("storagevehicle_code") + "'"); + WQLObject.getWQLObject("ST_IVT_IOStorInvDisDtl").update(dis_map, "iostorinv_id = '" + map.get("iostorinv_id") + "' AND storagevehicle_code = '" + map.get("storagevehicle_code") + "'"); + + //修改库存 + //直接取出入库分配表的库存 + JSONArray dis_rows = WQLObject.getWQLObject("ST_IVT_IOStorInvDis").query("iostorinv_id = '" + map.get("iostorinv_id") + "' AND storagevehicle_code = '" + map.get("storagevehicle_code") + "'").getResultJSONArray(0); + JSONObject mst_jo = WQLObject.getWQLObject("ST_IVT_IOStorInv").query("iostorinv_id = '" + map.get("iostorinv_id") + "'").uniqueResult(0); + for (int i = 0; i < dis_rows.size(); i++) { + JSONObject dis_jo = dis_rows.getJSONObject(i); + JSONObject i_form = new JSONObject(); + i_form.put("struct_id", dis_jo.getString("struct_id")); + i_form.put("material_id", dis_jo.getString("material_id")); + i_form.put("quality_scode", dis_jo.getString("quality_scode")); + i_form.put("pcsn", dis_jo.getString("pcsn")); + i_form.put("ivt_level", dis_jo.getString("ivt_level")); + i_form.put("is_active", dis_jo.getString("is_active")); + i_form.put("change_qty", dis_jo.getString("plan_qty")); + i_form.put("bill_type_scode", mst_jo.getString("bill_type")); + i_form.put("inv_id", mst_jo.getString("iostorinv_id")); + i_form.put("bill_code", mst_jo.getString("bill_code")); + i_form.put("bill_table", "ST_IVT_IOStorInv"); + i_form.put("qty_unit_id", dis_jo.getString("qty_unit_id")); + i_form.put("qty_unit_name", dis_jo.getString("qty_unit_name")); + storPublicService.IOStor(i_form, "31"); + + if (StrUtil.isNotEmpty(ios_dis.getString("point_code"))) { + //更新明细表状态 + JSONObject dtl_jo = WQLObject.getWQLObject("ST_IVT_IOStorInvDtl").query("iostorinvdtl_id = '" + dis_jo.getString("iostorinvdtl_id") + "'").uniqueResult(0); + if (dtl_jo.getDoubleValue("unassign_qty") == 0) { + //判断该明细下是否还存在未分配货位的分配明细 + JSONArray disdiv_rows = WQLObject.getWQLObject("ST_IVT_IOStorInvDis").query("iostorinvdtl_id = '" + dis_jo.getString("iostorinvdtl_id") + "' AND (struct_id = '' OR struct_id is null) AND (point_code = '' OR point_code is null)").getResultJSONArray(0); + if (disdiv_rows.size() == 0) { + dtl_jo.put("bill_status", "40"); + WQLObject.getWQLObject("ST_IVT_IOStorInvDtl").update(dtl_jo); + //判断主表下的明细是否都为40 + JSONArray dtl_rows = WQLObject.getWQLObject("ST_IVT_IOStorInvDtl").query("iostorinv_id = '" + dis_jo.getString("iostorinv_id") + "' AND bill_status < '40'").getResultJSONArray(0); + if (dtl_rows.size() == 0) { + mst_jo.put("bill_status", "40"); + mst_jo.put("dis_optid", currentUserId); + mst_jo.put("dis_optname", nickName); + mst_jo.put("dis_time", now); + WQLObject.getWQLObject("ST_IVT_IOStorInv").update(mst_jo); + } + } + } + } + } + } + + @Transactional(rollbackFor = Exception.class) + @Override + public void unDivStruct(Map jo) { + WQLObject dis_wql = WQLObject.getWQLObject("ST_IVT_IOStorInvDis"); + WQLObject point_table = WQLObject.getWQLObject("SCH_BASE_Point"); + WQLObject struct_table = WQLObject.getWQLObject("ST_IVT_StructAttr"); + + ArrayList rows = (ArrayList) jo.get("tableMater"); + HashMap whereJson = rows.get(0); + + //解锁原货位点位 + HashMap unlock_map = new HashMap(); + unlock_map.put("lock_type", "00"); + unlock_map.put("taskdtl_type", ""); + unlock_map.put("taskdtl_id", ""); + unlock_map.put("task_code", ""); + unlock_map.put("inv_type", ""); + unlock_map.put("inv_id", ""); + unlock_map.put("inv_code", ""); + point_table.update(unlock_map, "point_code = '" + whereJson.get("struct_code") + "'"); + struct_table.update(unlock_map, "struct_code = '" + whereJson.get("struct_code") + "'"); + + //减去原货位的待入数 + JSONArray dis_rows = dis_wql.query("struct_code = '" + whereJson.get("struct_code") + "' AND work_status < '99'").getResultJSONArray(0); + if (dis_rows.size() <= 0) { + throw new BadRequestException("数据参数有误！"); + } + StructattrDto old_struct = structattrService.findByCode((String) whereJson.get("struct_code")); + JSONObject mst_jo = WQLObject.getWQLObject("ST_IVT_IOStorInv").query("iostorinv_id = '" + dis_rows.getJSONObject(0).getString("iostorinv_id") + "'").uniqueResult(0); + for (int i = 0; i < dis_rows.size(); i++) { + JSONObject i_form = new JSONObject(); + JSONObject dis_row = dis_rows.getJSONObject(i); + i_form.put("struct_id", old_struct.getStruct_id()); + i_form.put("material_id", dis_row.getString("material_id")); + i_form.put("quality_scode", dis_row.getString("quality_scode")); + i_form.put("pcsn", dis_row.getString("pcsn")); + i_form.put("ivt_level", dis_row.getString("ivt_level")); + i_form.put("is_active", dis_row.getString("is_active")); + i_form.put("change_qty", dis_row.getString("plan_qty")); + i_form.put("bill_type_scode", mst_jo.getString("bill_type")); + i_form.put("inv_id", mst_jo.getString("iostorinv_id")); + i_form.put("bill_code", mst_jo.getString("bill_code")); + i_form.put("bill_table", "ST_IVT_IOStorInv"); + i_form.put("qty_unit_id", dis_row.getString("qty_unit_id")); + i_form.put("qty_unit_name", dis_row.getString("qty_unit_name")); + storPublicService.IOStor(i_form, "32"); + + //对分配明细进行循环 + JSONArray disdtl_rows = WQLObject.getWQLObject("ST_IVT_IOStorInvDisDtl").query("iostorinvdis_id = '" + dis_row.getString("iostorinvdis_id") + "'").getResultJSONArray(0); + for (int j = 0; j < disdtl_rows.size(); j++) { + JSONObject disdtl_row = disdtl_rows.getJSONObject(j); + WQLObject dis_dtl = WQLObject.getWQLObject("ST_IVT_IOStorInvDisDtl"); + dis_dtl.delete("iostorinvdisdtl_id = '" + (String) disdtl_row.get("iostorinvdisdtl_id") + "'"); + //更新桶记录表，判断单据是否为立库返工入库，如果是则删除桶记录，并还原立库出库确认表 + if (mst_jo.getString("bill_type").equals("000301")) { + WQLObject.getWQLObject("MD_PB_BucketRecord").delete("bucketunique = '" + disdtl_row.get("bucketunique") + "' AND status = '02'"); + HashMap out_map = new HashMap<>(); + out_map.put("status", "0"); + WQLObject.getWQLObject("PDM_LK_OutPalletMateril").update(out_map, "bucketunique = '" + disdtl_row.get("bucketunique") + "' AND status = '1'"); + } else { + HashMap bucket_map = new HashMap<>(); + bucket_map.put("status", "01"); + bucket_map.put("makeup_optid", ""); + bucket_map.put("makeup_optname", ""); + bucket_map.put("makeup_time", ""); + bucket_map.put("storagevehicle_id", ""); + bucket_map.put("storagevehicle_code", ""); + WQLObject.getWQLObject("MD_PB_BucketRecord").update(bucket_map, "bucketunique = '" + disdtl_row.get("bucketunique") + "' AND status = '02'"); + } + } + //回写明细表数量 + double real_qty = -Double.parseDouble((String) dis_row.get("plan_qty")); + JSONObject dtl = WQLObject.getWQLObject("ST_IVT_IOStorInvDtl").query("iostorinvdtl_id ='" + dis_row.get("iostorinvdtl_id") + "'").uniqueResult(0); + double assign_qty = NumberUtil.add(dtl.getDoubleValue("assign_qty"), real_qty); + dtl.put("assign_qty", assign_qty); + double unassign_qty = NumberUtil.sub(dtl.getDoubleValue("plan_qty"), assign_qty); + + if (unassign_qty < 0) { + unassign_qty = 0; + } + dtl.put("unassign_qty", unassign_qty); + if (assign_qty > 0) { + dtl.put("bill_status", "30"); + } else { + dtl.put("bill_status", "10"); + } + WQLObject.getWQLObject("ST_IVT_IOStorInvDtl").update(dtl); + + //删除该分配 + dis_wql.delete(dis_row); + } + //更新主表状态 + JSONArray dtl_rows = WQLObject.getWQLObject("ST_IVT_IOStorInvDtl").query("iostorinv_id = '" + mst_jo.get("iostorinv_id") + "' AND bill_status IN ('20','30')").getResultJSONArray(0); + if (dtl_rows.size() > 0) { + mst_jo.put("bill_status", "30"); + } else { + mst_jo.put("bill_status", "10"); + } + WQLObject.getWQLObject("ST_IVT_IOStorInv").update(mst_jo); + } + + @Transactional(rollbackFor = Exception.class) + @Override + public void divPoint(Map whereJson) { + Long currentUserId = SecurityUtils.getCurrentUserId(); + String nickName = SecurityUtils.getCurrentNickName(); + String now = DateUtil.now(); + + ArrayList rows = (ArrayList) whereJson.get("tableMater"); + String point_code = (String) whereJson.get("point_code"); + HashMap map = rows.get(0); + + 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()); + + //判断起点终点是否不为空 + JSONObject ios_dis = WQLObject.getWQLObject("ST_IVT_IOStorInvDis").query("iostorinv_id = '" + map.get("iostorinv_id") + "' AND storagevehicle_code = '" + map.get("storagevehicle_code") + "'").uniqueResult(0); + if (StrUtil.isNotEmpty(ios_dis.getString("struct_code"))) { + //创建任务 + AbstractAcsTask task = null; + JSONObject task_form = new JSONObject(); + task_form.put("task_type", "01"); + task_form.put("taskdtl_type", "01"); + task_form.put("start_device_code", point_code); + task_form.put("next_device_code", ios_dis.getString("struct_code")); + task_form.put("storagevehicle_id", map.get("storagevehicle_id")); + task_form.put("vehicle_code", map.get("storagevehicle_code")); + task_form.put("storagevehicle_type", map.get("storagevehicle_type")); + //查询主表信息 + JSONObject mst = WQLObject.getWQLObject("st_ivt_iostorinv").query("iostorinv_id = '" + map.get("iostorinv_id") + "'").uniqueResult(0); + task_form.put("inv_type", mst.get("bill_type")); + task_form.put("inv_id", mst.get("iostorinv_id")); + task_form.put("inv_code", mst.get("bill_code")); + String task_id = task.createTask(task_form); + point_map.put("task_id", task_id); + point_map.put("work_status", "01"); + } + WQLObject.getWQLObject("ST_IVT_IOStorInvDis").update(point_map, "iostorinv_id = '" + map.get("iostorinv_id") + "' AND storagevehicle_code = '" + map.get("storagevehicle_code") + "'"); + + if (StrUtil.isNotEmpty(ios_dis.getString("struct_code"))) { + //修改库存 + //直接取出入库分配表的库存 + JSONArray dis_rows = WQLObject.getWQLObject("ST_IVT_IOStorInvDis").query("iostorinv_id = '" + map.get("iostorinv_id") + "' AND storagevehicle_code = '" + map.get("storagevehicle_code") + "'").getResultJSONArray(0); + JSONObject mst_jo = WQLObject.getWQLObject("ST_IVT_IOStorInv").query("iostorinv_id = '" + map.get("iostorinv_id") + "'").uniqueResult(0); + for (int i = 0; i < dis_rows.size(); i++) { + JSONObject dis_jo = dis_rows.getJSONObject(i); + //更新明细表状态 + JSONObject dtl_jo = WQLObject.getWQLObject("ST_IVT_IOStorInvDtl").query("iostorinvdtl_id = '" + dis_jo.getString("iostorinvdtl_id") + "'").uniqueResult(0); + if (dtl_jo.getDoubleValue("unassign_qty") == 0) { + //判断该明细下是否还存在未分配货位的分配明细 + JSONArray disdiv_rows = WQLObject.getWQLObject("ST_IVT_IOStorInvDis").query("iostorinvdtl_id = '" + dis_jo.getString("iostorinvdtl_id") + "' AND (struct_id = '' OR struct_id is null) AND (point_code = '' OR point_code is null)").getResultJSONArray(0); + if (disdiv_rows.size() == 0) { + dtl_jo.put("bill_status", "40"); + WQLObject.getWQLObject("ST_IVT_IOStorInvDtl").update(dtl_jo); + //判断主表下的明细是否都为40 + JSONArray dtl_rows = WQLObject.getWQLObject("ST_IVT_IOStorInvDtl").query("iostorinv_id = '" + dis_jo.getString("iostorinv_id") + "' AND bill_status < '40'").getResultJSONArray(0); + if (dtl_rows.size() == 0) { + mst_jo.put("bill_status", "40"); + mst_jo.put("dis_optid", currentUserId); + mst_jo.put("dis_optname", nickName); + mst_jo.put("dis_time", now); + WQLObject.getWQLObject("ST_IVT_IOStorInv").update(mst_jo); + } + } + } + } + } + } + + @Override + public JSONArray queryTask(Map whereJson) { + HashMap map = new HashMap<>(); + map.put("flag", "5"); + map.put("iostorinvdtl_id", (String) whereJson.get("iostorinvdtl_id")); + map.put("is_finish", (String) whereJson.get("checked")); + JSONArray rows = WQL.getWO("QST_IVT_RAWASSISTISTOR").addParamMap(map).process().getResultJSONArray(0); + return rows; + } + + @Override + public JSONArray bucketDtl(Map whereJson) { + HashMap map = new HashMap<>(); + map.put("flag", "6"); + map.put("storagevehicle_code", (String) whereJson.get("storagevehicle_code")); + map.put("iostorinv_id", (String) whereJson.get("iostorinv_id")); + JSONArray rows = WQL.getWO("QST_IVT_RAWASSISTISTOR").addParamMap(map).process().getResultJSONArray(0); + return rows; + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void updateTask(Map whereJson) { + WQLObject dis_wql = WQLObject.getWQLObject("ST_IVT_IOStorInvDis"); + WQLObject task_wql = WQLObject.getWQLObject("SCH_BASE_Task"); + WQLObject point_table = WQLObject.getWQLObject("SCH_BASE_Point"); + WQLObject struct_table = WQLObject.getWQLObject("ST_IVT_StructAttr"); + + + //判断指令状态，只能修改生成状态的任务 + String task_code = (String) whereJson.get("task_code"); + TaskDto taskDto = taskService.findByCode(task_code); + if (ObjectUtil.isEmpty(taskDto)) { + throw new BadRequestException("请输入正确的任务号！"); + } + if (!taskDto.getTask_status().equals("01")) { + throw new BadRequestException("只能修改任务状态为生成的任务！"); + } + + //判断入库点是否修改 + if (!whereJson.get("point_code").equals(whereJson.get("new_point_code"))) { + HashMap dis_map = new HashMap<>(); + HashMap task_map = new HashMap<>(); + PointDto pointDto = pointService.findByCode((String) whereJson.get("new_point_code")); + dis_map.put("point_code", pointDto.getPoint_code()); + dis_map.put("point_id", pointDto.getPoint_id() + ""); + dis_map.put("point_name", pointDto.getPoint_name()); + task_map.put("start_point_code", (String) whereJson.get("new_point_code")); + //修改分配表起点，任务表起点 + dis_wql.update(dis_map, "task_id = '" + whereJson.get("task_id") + "'"); + task_wql.update(task_map, "taskdtl_id = '" + whereJson.get("task_id") + "'"); + } + + + //判断目标货位是否修改 + if (!whereJson.get("struct_code").equals(whereJson.get("new_struct_code"))) { + //修改任务表终点 + HashMap task_map = new HashMap<>(); + task_map.put("next_point_code", (String) whereJson.get("new_struct_code")); + task_wql.update(task_map, "taskdtl_id = '" + whereJson.get("task_id") + "'"); + + //更新分配表的目的仓位 + StructattrDto structattrDto = structattrService.findByCode((String) whereJson.get("new_struct_code")); + HashMap str_map = new HashMap<>(); + str_map.put("sect_id", structattrDto.getSect_id()); + str_map.put("sect_code", structattrDto.getSect_code()); + str_map.put("sect_name", structattrDto.getSect_name()); + str_map.put("struct_id", structattrDto.getStruct_id()); + str_map.put("struct_code", structattrDto.getStruct_code()); + str_map.put("struct_name", structattrDto.getStruct_name()); + dis_wql.update(str_map, "task_id = '" + whereJson.get("task_id") + "'"); + + //原货位解锁，新货位加锁 + HashMap unlock_map = new HashMap(); + unlock_map.put("lock_type", "00"); + point_table.update(unlock_map, "point_code = '" + whereJson.get("struct_code") + "'"); + struct_table.update(unlock_map, "struct_code = '" + whereJson.get("struct_code") + "'"); + + HashMap lock_map = new HashMap(); + lock_map.put("lock_type", "01"); + point_table.update(lock_map, "point_code = '" + whereJson.get("new_struct_code") + "'"); + struct_table.update(lock_map, "struct_code = '" + whereJson.get("new_struct_code") + "'"); + + //减去原库位待入数，加上新货位待入数 + //查询为该任务id的入库分配表，进行循环物料修改库存 + JSONArray dis_rows = dis_wql.query("task_id = '" + whereJson.get("task_id") + "'").getResultJSONArray(0); + if (dis_rows.size() <= 0) { + throw new BadRequestException("数据参数有误！"); + } + StructattrDto old_struct = structattrService.findByCode((String) whereJson.get("struct_code")); + JSONObject mst_jo = WQLObject.getWQLObject("ST_IVT_IOStorInv").query("iostorinv_id = '" + dis_rows.getJSONObject(0).getString("iostorinv_id") + "'").uniqueResult(0); + for (int i = 0; i < dis_rows.size(); i++) { + JSONObject i_form = new JSONObject(); + JSONObject dis_row = dis_rows.getJSONObject(i); + i_form.put("struct_id", old_struct.getStruct_id()); + i_form.put("material_id", dis_row.getString("material_id")); + i_form.put("quality_scode", dis_row.getString("quality_scode")); + i_form.put("pcsn", dis_row.getString("pcsn")); + i_form.put("ivt_level", dis_row.getString("ivt_level")); + i_form.put("is_active", dis_row.getString("is_active")); + i_form.put("change_qty", dis_row.getString("plan_qty")); + i_form.put("bill_type_scode", mst_jo.getString("bill_type")); + i_form.put("inv_id", mst_jo.getString("iostorinv_id")); + i_form.put("bill_code", mst_jo.getString("bill_code")); + i_form.put("bill_table", "ST_IVT_IOStorInv"); + i_form.put("qty_unit_id", dis_row.getString("qty_unit_id")); + i_form.put("qty_unit_name", dis_row.getString("qty_unit_name")); + storPublicService.IOStor(i_form, "32"); + + i_form.put("struct_id", structattrDto.getStruct_id()); + storPublicService.IOStor(i_form, "31"); + } + } + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void delTask(Map whereJson) { + WQLObject dis_wql = WQLObject.getWQLObject("ST_IVT_IOStorInvDis"); + WQLObject task_wql = WQLObject.getWQLObject("SCH_BASE_Task"); + WQLObject point_table = WQLObject.getWQLObject("SCH_BASE_Point"); + WQLObject struct_table = WQLObject.getWQLObject("ST_IVT_StructAttr"); + WQLObject change = WQLObject.getWQLObject("MD_PB_BucketChangeFlow"); + + + //判断指令状态，只能修改生成状态的任务 + String taskdtl_id = (String) whereJson.get("taskdtl_id"); + TaskDto taskDto = taskService.findByDtlId(taskdtl_id); + if (ObjectUtil.isEmpty(taskDto)) { + throw new BadRequestException("请输入正确的任务号！"); + } + if (!taskDto.getTask_status().equals("01")) { + throw new BadRequestException("只能修改任务状态为生成的任务！"); + } + + Long currentUserId = SecurityUtils.getCurrentUserId(); + String nickName = SecurityUtils.getCurrentNickName(); + String now = DateUtil.now(); + + //更新任务表状态为删除 + HashMap task_map = new HashMap<>(); + task_map.put("is_delete", "1"); + task_map.put("update_optid", currentUserId); + task_map.put("update_optname", nickName); + task_map.put("update_time", now); + //修改分配表起点，任务表起点 + task_wql.update(task_map, "taskdtl_id = '" + taskDto.getTaskdtl_id() + "'"); + + //解锁原货位点位 + HashMap unlock_map = new HashMap(); + unlock_map.put("lock_type", "00"); + unlock_map.put("taskdtl_type", ""); + unlock_map.put("taskdtl_id", ""); + unlock_map.put("task_code", ""); + unlock_map.put("inv_type", ""); + unlock_map.put("inv_id", ""); + unlock_map.put("inv_code", ""); + point_table.update(unlock_map, "point_code = '" + whereJson.get("struct_code") + "'"); + struct_table.update(unlock_map, "struct_code = '" + whereJson.get("struct_code") + "'"); + + //减去原货位的待入数 + JSONArray dis_rows = dis_wql.query("task_id = '" + whereJson.get("task_id") + "'").getResultJSONArray(0); + if (dis_rows.size() <= 0) { + throw new BadRequestException("数据参数有误！"); + } + StructattrDto old_struct = structattrService.findByCode((String) whereJson.get("struct_code")); + JSONObject mst_jo = WQLObject.getWQLObject("ST_IVT_IOStorInv").query("iostorinv_id = '" + dis_rows.getJSONObject(0).getString("iostorinv_id") + "'").uniqueResult(0); + for (int i = 0; i < dis_rows.size(); i++) { + JSONObject i_form = new JSONObject(); + JSONObject dis_row = dis_rows.getJSONObject(i); + i_form.put("struct_id", old_struct.getStruct_id()); + i_form.put("material_id", dis_row.getString("material_id")); + i_form.put("quality_scode", dis_row.getString("quality_scode")); + i_form.put("pcsn", dis_row.getString("pcsn")); + i_form.put("ivt_level", dis_row.getString("ivt_level")); + i_form.put("is_active", dis_row.getString("is_active")); + i_form.put("change_qty", dis_row.getString("plan_qty")); + i_form.put("bill_type_scode", mst_jo.getString("bill_type")); + i_form.put("inv_id", mst_jo.getString("iostorinv_id")); + i_form.put("bill_code", mst_jo.getString("bill_code")); + i_form.put("bill_table", "ST_IVT_IOStorInv"); + i_form.put("qty_unit_id", dis_row.getString("qty_unit_id")); + i_form.put("qty_unit_name", dis_row.getString("qty_unit_name")); + storPublicService.IOStor(i_form, "32"); + + //对分配明细进行循环 + JSONArray disdtl_rows = WQLObject.getWQLObject("ST_IVT_IOStorInvDisDtl").query("iostorinvdis_id = '" + dis_row.getString("iostorinvdis_id") + "'").getResultJSONArray(0); + for (int j = 0; j < disdtl_rows.size(); j++) { + JSONObject disdtl_row = disdtl_rows.getJSONObject(j); + WQLObject dis_dtl = WQLObject.getWQLObject("ST_IVT_IOStorInvDisDtl"); + dis_dtl.delete("iostorinvdisdtl_id = '" + (String) disdtl_row.get("iostorinvdisdtl_id") + "'"); + //更新桶记录表，判断单据是否为立库返工入库，如果是则删除桶记录，并还原立库出库确认表 + if (mst_jo.getString("bill_type").equals("000301")) { + WQLObject.getWQLObject("MD_PB_BucketRecord").delete("bucketunique = '" + disdtl_row.get("bucketunique") + "' AND status = '02'"); + HashMap out_map = new HashMap<>(); + out_map.put("status", "0"); + WQLObject.getWQLObject("PDM_LK_OutPalletMateril").update(out_map, "bucketunique = '" + disdtl_row.get("bucketunique") + "' AND status = '1'"); + } else { + HashMap bucket_map = new HashMap<>(); + bucket_map.put("status", "01"); + bucket_map.put("makeup_optid", ""); + bucket_map.put("makeup_optname", ""); + bucket_map.put("makeup_time", ""); + bucket_map.put("storagevehicle_id", ""); + bucket_map.put("storagevehicle_code", ""); + if (mst_jo.getString("bill_type").equals("000302")) { + bucket_map.put("quality_scode", "00"); + } + WQLObject.getWQLObject("MD_PB_BucketRecord").update(bucket_map, "bucketunique = '" + disdtl_row.get("bucketunique") + "' AND status = '02'"); + + JSONObject bucket_now = WQLObject.getWQLObject("MD_PB_BucketRecord").query("bucketunique = '" + disdtl_row.get("bucketunique") + "' AND status = '01'").uniqueResult(0); + if (mst_jo.getString("bill_type").equals("000302")) { + //插入桶物料变动记录表，加待检 + JSONObject change_jo = new JSONObject(); + change_jo.put("change_id", IdUtil.getSnowflake(1, 1).nextId()); + change_jo.put("bucket_code", bucket_now.get("bucketunique")); + change_jo.put("material_id", bucket_now.get("material_id")); + change_jo.put("pcsn", bucket_now.get("pcsn")); + change_jo.put("ivt_level", bucket_now.get("ivt_level")); + change_jo.put("is_active", bucket_now.get("is_active")); + change_jo.put("quality_scode", "00"); + change_jo.put("qty_unit_id", bucket_now.get("qty_unit_id")); + change_jo.put("qty_unit_name", bucket_now.get("qty_unit_name")); + change_jo.put("change_type_scode", "01"); + change_jo.put("change_time", now); + change_jo.put("rec_person", currentUserId); + change_jo.put("change_qty", bucket_now.get("storage_qty")); + change_jo.put("result_qty", bucket_now.get("storage_qty")); + change.insert(change_jo); + + //插入桶物料变动记录表，减不良 + JSONObject change_jo2 = new JSONObject(); + change_jo2.put("change_id", IdUtil.getSnowflake(1, 1).nextId()); + change_jo2.put("bucket_code", bucket_now.get("bucketunique")); + change_jo2.put("material_id", bucket_now.get("material_id")); + change_jo2.put("pcsn", bucket_now.get("pcsn")); + change_jo2.put("ivt_level", bucket_now.get("ivt_level")); + change_jo2.put("is_active", bucket_now.get("is_active")); + change_jo2.put("quality_scode", "02"); + change_jo2.put("qty_unit_id", bucket_now.get("qty_unit_id")); + change_jo2.put("qty_unit_name", bucket_now.get("qty_unit_name")); + change_jo2.put("change_type_scode", "02"); + change_jo2.put("change_time", now); + change_jo2.put("rec_person", currentUserId); + change_jo2.put("change_qty", bucket_now.get("storage_qty")); + change_jo2.put("result_qty", "0"); + change.insert(change_jo2); + } + } + } + //回写明细表数量 + double real_qty = -Double.parseDouble((String) dis_row.get("plan_qty")); + JSONObject dtl = WQLObject.getWQLObject("ST_IVT_IOStorInvDtl").query("iostorinvdtl_id ='" + dis_row.get("iostorinvdtl_id") + "'").uniqueResult(0); + double assign_qty = NumberUtil.add(dtl.getDoubleValue("assign_qty"), real_qty); + dtl.put("assign_qty", assign_qty); + double unassign_qty = NumberUtil.sub(dtl.getDoubleValue("plan_qty"), assign_qty); + + if (unassign_qty < 0) { + unassign_qty = 0; + } + dtl.put("unassign_qty", unassign_qty); + if (assign_qty > 0) { + dtl.put("bill_status", "30"); + } else { + dtl.put("bill_status", "10"); + } + WQLObject.getWQLObject("ST_IVT_IOStorInvDtl").update(dtl); + + //删除该分配 + dis_wql.delete(dis_row); + } + //更新主表状态 + JSONArray dtl_rows = WQLObject.getWQLObject("ST_IVT_IOStorInvDtl").query("iostorinv_id = '" + mst_jo.get("iostorinv_id") + "' AND bill_status IN ('20','30')").getResultJSONArray(0); + if (dtl_rows.size() > 0) { + mst_jo.put("bill_status", "30"); + } else { + mst_jo.put("bill_status", "10"); + } + WQLObject.getWQLObject("ST_IVT_IOStorInv").update(mst_jo); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void reIssueTask(Map whereJson) { + //判断指令状态，只能下发生成、执行中状态的任务 + String taskdtl_id = (String) whereJson.get("taskdtl_id"); + String task_id = (String) whereJson.get("task_id"); + TaskDto taskDto = new TaskDto(); + if (StrUtil.isNotEmpty(taskdtl_id)) { + taskDto = taskService.findByDtlId(taskdtl_id); + } else { + taskDto = taskService.findById(task_id); + } + if (ObjectUtil.isEmpty(taskDto)) { + throw new BadRequestException("请输入正确的任务号！"); + } + if (!taskDto.getTask_status().equals("01")) { + throw new BadRequestException("只能修改任务状态为生成的任务！"); + } + AbstractAcsTask task = null; + //调用ACS接受任务接口 + JSONObject result = null; + if (ObjectUtil.isNotEmpty(result)) { + String status = result.getString("status"); + if ("200".equals(status)) { + HashMap map = new HashMap<>(); + //更新任务指令为下发 + JSONObject task_jo = new JSONObject(); + task_jo.put("taskdtl_id", taskDto.getTaskdtl_id()); + task_jo.put("task_id", taskDto.getTask_id()); + task.updateTaskStatus(task_jo, "1"); + } else { + throw new BadRequestException("任务下发失败:" + result.getString("message")); + } + } + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void confirmTask(Map whereJson) { + WQLObject dis_wql = WQLObject.getWQLObject("ST_IVT_IOStorInvDis"); + WQLObject dtl_wql = WQLObject.getWQLObject("st_ivt_iostorinvdtl"); + + //校验主表状态为分配中、分配完 + JSONObject mst_jo = WQLObject.getWQLObject("ST_IVT_IOStorInv").query("iostorinv_id = '" + whereJson.get("iostorinv_id") + "'").uniqueResult(0); + if (!mst_jo.getString("bill_status").equals("30") && !mst_jo.getString("bill_status").equals("40")) { + throw new BadRequestException("主表状态必须为分配中、分配完！"); + } + + //分配中任务状态必须全部为完成 + JSONArray dis_rows = dis_wql.query("iostorinv_id = '" + whereJson.get("iostorinv_id") + "' AND work_status < '99'").getResultJSONArray(0); + if (dis_rows.size() > 0) { + throw new BadRequestException("存在未完成的作业，或存在组盘记录！"); + } + + //将明细全部变为99 + HashMap map = new HashMap(); + map.put("bill_status", "99"); + dtl_wql.update(map, "iostorinv_id = '" + whereJson.get("iostorinv_id") + "' AND bill_status < '99'").getResultJSONArray(0); + + //完成单据 + inbillService.confirmMst(JSONObject.parseObject(JSON.toJSONString(whereJson))); + } + + @Override + public void cancelTask(Map whereJson) { + WQLObject dis_wql = WQLObject.getWQLObject("ST_IVT_IOStorInvDis"); + WQLObject task_wql = WQLObject.getWQLObject("SCH_BASE_Task"); + WQLObject dtl_wql = WQLObject.getWQLObject("ST_IVT_IOStorInvDtl"); + + + //判断指令状态，只能取消完成状态的任务 + String task_code = (String) whereJson.get("task_code"); + TaskDto taskDto = taskService.findByCode(task_code); + if (ObjectUtil.isEmpty(taskDto)) { + throw new BadRequestException("请输入正确的任务号！"); + } + if (!taskDto.getTask_status().equals("99")) { + throw new BadRequestException("只能取消任务状态为完成中的任务！"); + } + + //判断主表是否为99，如果为99不允许取消 + JSONObject mst_jo = WQLObject.getWQLObject("ST_IVT_IOStorInv").query("iostorinv_id = '" + whereJson.get("iostorinv_id") + "'").uniqueResult(0); + if (mst_jo.getString("bill_status").equals("99")) { + throw new BadRequestException("单据已完成，无法进行取消任务操作！"); + } + + //变更任务状态 + HashMap task_map = new HashMap(); + task_map.put("task_status", "01"); + task_wql.update(task_map, "taskdtl_id = '" + whereJson.get("task_id") + "'"); + + //更新实际数量 + JSONArray dis_rows = dis_wql.query("task_id = '" + whereJson.get("task_id") + "'").getResultJSONArray(0); + for (int i = 0; i < dis_rows.size(); i++) { + JSONObject dis_row = dis_rows.getJSONObject(i); + double real_qty = dis_row.getDoubleValue("real_qty"); + dis_row.put("real_qty", "0"); + dis_row.put("work_status", "01"); + dis_wql.update(dis_row); + + //更新明细实际数量 + JSONObject dtl_jo = dtl_wql.query("iostorinvdtl_id = '" + dis_row.getString("iostorinvdtl_id") + "'").uniqueResult(0); + double old_real_qty = dtl_jo.getDoubleValue("real_qty"); + dtl_jo.put("real_qty", NumberUtil.sub(old_real_qty, real_qty)); + dtl_wql.update(dtl_jo); + } + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void confirm(Map whereJson) { + WQLObject dis_wql = WQLObject.getWQLObject("ST_IVT_IOStorInvDis"); + WQLObject dtl_wql = WQLObject.getWQLObject("st_ivt_iostorinvdtl"); + + //校验主表状态为分配中、分配完 + JSONObject mst_jo = WQLObject.getWQLObject("ST_IVT_IOStorInv").query("iostorinv_id = '" + whereJson.get("iostorinv_id") + "'").uniqueResult(0); + if (!mst_jo.getString("bill_status").equals("30") && !mst_jo.getString("bill_status").equals("40")) { + throw new BadRequestException("主表状态必须为分配中、分配完！"); + } + + //分配中任务状态必须全部为完成 + JSONArray dis_rows = dis_wql.query("iostorinv_id = '" + whereJson.get("iostorinv_id") + "' AND work_status < '99'").getResultJSONArray(0); + if (dis_rows.size() > 0) { + throw new BadRequestException("存在未完成的作业，或存在组盘记录！"); + } + + //将明细全部变为99 + HashMap map = new HashMap(); + map.put("bill_status", "99"); + dtl_wql.update(map, "iostorinv_id = '" + whereJson.get("iostorinv_id") + "' AND bill_status < '99'").getResultJSONArray(0); + + //完成单据 + inbillService.confirmMst(JSONObject.parseObject(JSON.toJSONString(whereJson))); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void backConfirm(Map whereJson) { + WQLObject dtl_wql = WQLObject.getWQLObject("st_ivt_iostorinvdtl"); + WQLObject mst_wql = WQLObject.getWQLObject("ST_IVT_IOStorInv"); + + //校验主表状态为生成 + JSONObject mst_jo = WQLObject.getWQLObject("ST_IVT_IOStorInv").query("iostorinv_id = '" + whereJson.get("iostorinv_id") + "'").uniqueResult(0); + if (!mst_jo.getString("bill_status").equals("10")) { + throw new BadRequestException("主表状态必须为生成！"); + } + + JSONObject mst_row = mst_wql.query("iostorinv_id = '" + whereJson.get("iostorinv_id") + "'").uniqueResult(0); + JSONArray dtl_rows = dtl_wql.query("iostorinv_id = '" + whereJson.get("iostorinv_id") + "'").getResultJSONArray(0); + + //生成手工出库单 + String iostorinv_id = IdUtil.getSnowflake(1, 1).nextId() + ""; + String bill_code = CodeUtil.getNewCode("IO_CODE"); + whereJson.put("iostorinv_id", iostorinv_id); + whereJson.put("bill_code", bill_code); + whereJson.put("io_type", "1"); + whereJson.put("bill_type", "010601"); + whereJson.put("buss_type", ((String) whereJson.get("bill_type")).substring(0, 4)); + mst_wql.insert(whereJson); + for (int i = 0; i < dtl_rows.size(); i++) { + JSONObject dtl_row = dtl_rows.getJSONObject(i); + dtl_row.put("source_billdtl_id", dtl_row.getString("iostorinvdtl_id")); + dtl_row.put("source_bill_type", mst_row.getString("bill_type")); + dtl_row.put("source_bill_code", mst_row.getString("bill_code")); + dtl_row.put("source_bill_table", "ST_IVT_IOStorInvDtl"); + dtl_row.put("iostorinvdtl_id", IdUtil.getSnowflake(1, 1).nextId()); + dtl_row.put("iostorinv_id", iostorinv_id); + dtl_row.put("bill_status", "10"); + dtl_wql.insert(dtl_row); + } + + Long currentUserId = SecurityUtils.getCurrentUserId(); + String nickName = SecurityUtils.getCurrentNickName(); + String now = DateUtil.now(); + + mst_row.put("bill_status", "99"); + mst_row.put("confirm_optid", currentUserId); + mst_row.put("confirm_optname", nickName); + mst_row.put("confirm_time", now); + //更新主表状态为99 + mst_wql.update(mst_row); + + HashMap map = new HashMap<>(); + map.put("bill_status", "99"); + dtl_wql.update(map, "iostorinv_id = '" + mst_row.get("iostorinv_id") + "'"); + } +} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/StorPublicServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/StorPublicServiceImpl.java new file mode 100644 index 000000000..730fd1d4a --- /dev/null +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/StorPublicServiceImpl.java @@ -0,0 +1,567 @@ +package org.nl.wms.st.inbill.service.impl; + +import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.IdUtil; +import cn.hutool.core.util.NumberUtil; +import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.StrUtil; +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.nl.modules.common.exception.BadRequestException; +import org.nl.modules.common.utils.SecurityUtils; +import org.nl.modules.wql.WQL; +import org.nl.modules.wql.core.bean.WQLObject; +import org.nl.wms.st.inbill.service.StorPublicService; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.HashMap; + +/** + * PC端出入库新增 + */ +@Service +@RequiredArgsConstructor +@Slf4j +public class StorPublicServiceImpl implements StorPublicService { + + @Transactional(rollbackFor = Exception.class) + void createStor(JSONObject from) { + // 货位库存表 + WQLObject wql_StructIvt = WQLObject.getWQLObject("ST_IVT_StructIvt"); + // 查询货位信息 + JSONObject jo = WQL.getWO("ST_PUB_QUERY_01") + .addParam("flag", "1") + .addParam("id", from.getString("struct_id")) + .process().uniqueResult(0); + if (jo == null) { + throw new BadRequestException("仓位不存在或者未启用：" + from.getString("struct_id")); + } + // 查询物料信息 + JSONObject jo_WMSMaterial = WQL.getWO("ST_PUB_QUERY_01") + .addParam("flag", "2") + .addParam("material_id", from.getString("material_id")) + .process() + .uniqueResult(0); + if (ObjectUtil.isEmpty(jo_WMSMaterial)) { + throw new BadRequestException("物料不存在或者未启用：" + from.getString("material_id")); + } + from.put("stockrecord_id", IdUtil.getSnowflake(1, 1).nextId() + ""); + from.put("struct_code", jo.getString("struct_code")); + from.put("struct_name", jo.getString("struct_name")); + from.put("stor_id", jo.getString("stor_id")); + from.put("stor_name", jo.getString("stor_name")); + from.put("instorage_time", DateUtil.now()); + wql_StructIvt.insert(from); + // 更新库存变动日志 + from.put("result_qty", from.getDoubleValue("ivt_qty")); + from.put("stor_code", jo.getString("stor_code")); + this.createStructIvtFlow(from); + } + + @Transactional(rollbackFor = Exception.class) + void createStructIvtFlow(JSONObject from) { + // 仓位库存变动记录表 + WQLObject wql_StructIvtFlow = WQLObject.getWQLObject("ST_IVT_StructIvtFlow"); + // 库区物流日表 + WQLObject wql_IOSectDaily = WQLObject.getWQLObject("ST_IVT_IOStorDaily"); + Long currentUserId = SecurityUtils.getCurrentUserId(); + String nickName = SecurityUtils.getCurrentNickName(); + + from.put("change_id", IdUtil.getSnowflake(1, 1).nextId() + ""); + from.put("change_time", DateUtil.now()); + from.put("change_person_id", currentUserId + ""); + from.put("change_person_name", nickName); + + String change_type_scode = from.getString("change_type_scode"); + String bill_code = from.getString("bill_code"); + + wql_StructIvtFlow.insert(from); + //拆拼盘不汇总到日表，库存变动记录还是要有记录 + if(bill_code.startsWith("YK") || bill_code.startsWith("CPP") ){ + return; + } + if("22,23,33,21,24,25,34".contains(change_type_scode)){ + String sect_date = DateUtil.today(); + // 出查询更新条件 + String sql_where = "stor_id = '" + from.getString("stor_id") + + "' and sect_date = '" + sect_date + + "' and material_id = '" + from.getString("material_id") + + "' and ivt_level = '" + from.getString("ivt_level") + + "' and is_active = '" + from.getString("is_active") + + "' and pcsn = '" + from.getString("pcsn") + + "' and quality_scode = '" + from.getString("quality_scode") + "'"; + JSONObject jo = wql_IOSectDaily.query(sql_where).uniqueResult(0); + if (jo == null) {// 新增 + String sql_where_before = "stor_id = '" + from.getString("stor_id") + + "' and material_id = '" + from.getString("material_id") + + "' and ivt_level = '" + from.getString("ivt_level") + + "' and is_active = '" + from.getString("is_active") + + "' and pcsn = '" + from.getString("pcsn") + + "' and quality_scode = '" + from.getString("quality_scode") + "'"; + JSONObject jo_before = wql_IOSectDaily.query(sql_where_before, "sect_date desc").uniqueResult(0); + if (jo_before == null) { + from.put("start_num", "0"); + } else { + from.put("start_num", jo_before.getDoubleValue("end_num")); + } + from.put("sect_date", sect_date); + if ("22,33".contains(change_type_scode)) { + from.put("in_num", from.getDoubleValue("change_qty")); + from.put("out_num", "0"); + from.put("end_num", from.getDoubleValue("start_num") + from.getDoubleValue("change_qty")); + from.put("more_num", "0"); + from.put("less_num", "0"); + } else if ("21,25,34".contains(change_type_scode)) { + from.put("in_num", "0"); + from.put("out_num", from.getDoubleValue("change_qty")); + from.put("end_num", from.getDoubleValue("start_num") - from.getDoubleValue("change_qty")); + from.put("more_num", "0"); + from.put("less_num", "0"); + }else if ("23".contains(change_type_scode)) { + from.put("in_num", "0"); + from.put("out_num", "0"); + from.put("end_num", from.getDoubleValue("start_num") + from.getDoubleValue("change_qty")); + from.put("more_num", from.getDoubleValue("change_qty")); + from.put("less_num", "0"); + }else if ("24".contains(change_type_scode)) { + from.put("in_num", "0"); + from.put("out_num", "0"); + from.put("end_num", from.getDoubleValue("start_num") - from.getDoubleValue("change_qty")); + from.put("more_num", "0"); + from.put("less_num", from.getDoubleValue("change_qty")); + } + + from.put("stordaily_id", IdUtil.getSnowflake(1, 1).nextId() + ""); + wql_IOSectDaily.insert(from); + } else {// 更新 + HashMap map = new HashMap(); + if ("22,33".contains(change_type_scode)) { + map.put("in_num", (from.getDoubleValue("change_qty") + jo.getDoubleValue("in_num")) + ""); + map.put("end_num", (from.getDoubleValue("change_qty") + jo.getDoubleValue("end_num")) + ""); + } else if ("21,25,34".contains(change_type_scode)) { + map.put("out_num", (from.getDoubleValue("change_qty") + jo.getDoubleValue("out_num")) + ""); + map.put("end_num", (jo.getDoubleValue("end_num") - from.getDoubleValue("change_qty")) + ""); + }else if ("24".contains(change_type_scode)) { + map.put("less_num", (from.getDoubleValue("change_qty") + jo.getDoubleValue("less_num")) + ""); + map.put("end_num", (jo.getDoubleValue("end_num") - from.getDoubleValue("change_qty")) + ""); + }else if ("23".contains(change_type_scode)) { + map.put("more_num", (from.getDoubleValue("change_qty") + jo.getDoubleValue("more_num")) + ""); + map.put("end_num", (from.getDoubleValue("change_qty") + jo.getDoubleValue("end_num")) + ""); + } + wql_IOSectDaily.update(map, sql_where); + } + } + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void IOStor(JSONObject from, String change_type_scode) { + // 仓位库存表 + WQLObject wql = WQLObject.getWQLObject("ST_IVT_StructIvt"); + String struct_id_In = ""; + String material_id_In = ""; + String pcsn_In = ""; + String ivt_level_In = ""; + String quality_scode_In = ""; + String is_active_In = ""; + double change_qty = 0; + if (ObjectUtil.isEmpty(from)) { + throw new BadRequestException("输入from异常，请检查"); + } + if (StrUtil.isBlank(change_type_scode)) { + throw new BadRequestException("变动类型不能为空"); + } + from.put("change_type_scode", change_type_scode); + struct_id_In = from.getString("struct_id"); + if (StrUtil.isBlank(struct_id_In)) { + throw new BadRequestException("货位不能为空"); + } + material_id_In = from.getString("material_id"); + if (StrUtil.isBlank(material_id_In)) { + throw new BadRequestException("物料不能为空"); + } + pcsn_In = from.getString("pcsn"); + if (StrUtil.isBlank(pcsn_In)) { + throw new BadRequestException("物料批次不能为空"); + } + ivt_level_In = from.getString("ivt_level"); + if (StrUtil.isBlank(ivt_level_In)) { + throw new BadRequestException("库存等级不能为空"); + } + quality_scode_In = from.getString("quality_scode"); + if (StrUtil.isBlank(quality_scode_In)) { + throw new BadRequestException("品质类型不能为空"); + } + is_active_In = from.getString("is_active"); + if (StrUtil.isBlank(is_active_In)) { + throw new BadRequestException("是否可用不能为空"); + } + change_qty = from.getDoubleValue("change_qty"); + if (change_qty <= 0) { + throw new BadRequestException("变动数异常，请检查"); + } + /*"struct_id = '" + struct_id_In + + "' and material_id = '" + material_id_In + + "' and pcsn = '" + pcsn_In + + "' and ivt_level = '" + ivt_level_In + + "' and is_active = '" + is_active_In + + "' and quality_scode = '" + quality_scode_In + "'";*/ + // 查询条件 + StringBuffer sql_where = new StringBuffer("struct_id = '"); + sql_where.append(struct_id_In); + sql_where.append("' and material_id = '"); + sql_where.append(material_id_In); + sql_where.append("' and pcsn = '"); + sql_where.append(pcsn_In); + sql_where.append("' and ivt_level = '"); + sql_where.append(ivt_level_In); + sql_where.append("' and is_active = '"); + sql_where.append(is_active_In); + sql_where.append("' and quality_scode = '"); + sql_where.append(quality_scode_In); + sql_where.append("'"); + + // 获取仓位物料信息 + JSONObject jo_in = wql.query(sql_where.toString()).uniqueResult(0); + switch (change_type_scode) { + case "11": //11加冻结、减可用：出库分配、移库移出 + if (jo_in != null) { + double ivt_qty = jo_in.getDoubleValue("ivt_qty"); + double canuse_qty = NumberUtil.sub(jo_in.getDoubleValue("canuse_qty"),change_qty); + if (canuse_qty < 0) { + throw new BadRequestException("可用数不允许为负数！"); + } + jo_in.put("canuse_qty", canuse_qty); + jo_in.put("frozen_qty", jo_in.getDoubleValue("frozen_qty") + change_qty); + + double ivt_num_now = jo_in.getDoubleValue("canuse_qty") + jo_in.getDoubleValue("frozen_qty"); + if (ivt_num_now != ivt_qty) { + throw new BadRequestException("输入数据异常，请检查"); + } + + wql.update(jo_in, "stockrecord_id='" + jo_in.getString("stockrecord_id") + "'"); + } else { + throw new BadRequestException(struct_id_In + "仓位库存异常，请检查"); + } + break; + case "12": //12减冻结、加可用：出库分配取消、移库移出取消 + if (jo_in != null) { + double ivt_qty = jo_in.getDoubleValue("ivt_qty"); + jo_in.put("canuse_qty", jo_in.getDoubleValue("canuse_qty") + change_qty); + jo_in.put("frozen_qty", NumberUtil.sub(jo_in.getDoubleValue("frozen_qty"),change_qty)); + + double ivt_num_now = jo_in.getDoubleValue("canuse_qty") + jo_in.getDoubleValue("frozen_qty"); + if (ivt_num_now != ivt_qty) { + throw new BadRequestException("输入数据异常，请检查"); + } + if (jo_in.getDoubleValue("frozen_qty") < 0) { + throw new BadRequestException("冻结数不允许为负数！"); + } + wql.update(jo_in, "stockrecord_id='" + jo_in.getString("stockrecord_id") + "'"); + } else { + throw new BadRequestException(struct_id_In + "仓位库存异常，请检查"); + } + break; + case "21": //21减冻结、减库存：出库确认、移库移出确认 + if (jo_in != null) { + jo_in.put("ivt_qty", NumberUtil.sub(jo_in.getDoubleValue("ivt_qty"),change_qty)); + double ivt_qty = jo_in.getDoubleValue("ivt_qty"); + jo_in.put("frozen_qty", NumberUtil.sub(jo_in.getDoubleValue("frozen_qty"),change_qty)); + + double ivt_num_now = jo_in.getDoubleValue("canuse_qty") + jo_in.getDoubleValue("frozen_qty"); + if (ivt_num_now != ivt_qty) { + throw new BadRequestException("输入数据异常，请检查"); + } + if (jo_in.getDoubleValue("ivt_qty") < 0) { + throw new BadRequestException("库存数不允许为负数！"); + } + if (jo_in.getDoubleValue("frozen_qty") < 0) { + throw new BadRequestException("冻结数不允许为负数！"); + } + wql.update(jo_in, "stockrecord_id='" + jo_in.getString("stockrecord_id") + "'"); + } else { + throw new BadRequestException(struct_id_In + "仓位库存异常，请检查"); + } + break; + case "22": //22加冻结、加库存：出库确认取消、移库移出确认取消 + if (jo_in != null) { + jo_in.put("ivt_qty", jo_in.getDoubleValue("ivt_qty") + change_qty); + double ivt_qty = jo_in.getDoubleValue("ivt_qty"); + jo_in.put("frozen_qty", jo_in.getDoubleValue("frozen_qty") + change_qty); + + double ivt_num_now = jo_in.getDoubleValue("canuse_qty") + jo_in.getDoubleValue("frozen_qty"); + if (ivt_num_now != ivt_qty) { + throw new BadRequestException("输入数据异常，请检查"); + } + wql.update(jo_in, "stockrecord_id='" + jo_in.getString("stockrecord_id") + "'"); + } else { + from.put("canuse_qty", "0"); + from.put("ivt_qty", change_qty); + from.put("frozen_qty", change_qty); + from.put("warehousing_qty", "0"); + this.createStor(from); + } + break; + case "23": //23同时加：质检（新）、损益单（溢）、损益单（损取消） + if (jo_in != null) { + jo_in.put("ivt_qty", jo_in.getDoubleValue("ivt_qty") + change_qty); + double ivt_qty = jo_in.getDoubleValue("ivt_qty"); + jo_in.put("canuse_qty", jo_in.getDoubleValue("canuse_qty") + change_qty); + + double ivt_num_now = jo_in.getDoubleValue("canuse_qty") + jo_in.getDoubleValue("frozen_qty"); + if (ivt_num_now != ivt_qty) { + throw new BadRequestException("输入数据异常，请检查"); + } + if (jo_in.getDoubleValue("canuse_qty") < 0) { + throw new BadRequestException("可用数不允许为负数！"); + } + wql.update(jo_in, "stockrecord_id='" + jo_in.getString("stockrecord_id") + "'"); + } else { + from.put("canuse_qty", change_qty); + from.put("ivt_qty", change_qty); + from.put("frozen_qty", "0"); + from.put("warehousing_qty", "0"); + this.createStor(from); + } + break; + case "24": //24同时减：质检（旧）、损益单（溢取消）、损益单（损） + case "25": //25同时减：配粉出库确认 + if (jo_in != null) { + jo_in.put("ivt_qty", NumberUtil.sub(jo_in.getDoubleValue("ivt_qty"),change_qty)); + double ivt_qty = jo_in.getDoubleValue("ivt_qty"); + jo_in.put("canuse_qty", NumberUtil.sub(jo_in.getDoubleValue("canuse_qty"),change_qty)); + + double ivt_num_now = jo_in.getDoubleValue("canuse_qty") + jo_in.getDoubleValue("frozen_qty"); + if (ivt_num_now != ivt_qty) { + throw new BadRequestException("输入数据异常，请检查"); + } + if (jo_in.getDoubleValue("ivt_qty") < 0) { + throw new BadRequestException("库存数不允许为负数！"); + } + if (jo_in.getDoubleValue("canuse_qty") < 0) { + throw new BadRequestException("可用数不允许为负数！"); + } + wql.update(jo_in, "stockrecord_id='" + jo_in.getString("stockrecord_id") + "'"); + } else { + throw new BadRequestException(struct_id_In + "仓位库存异常，请检查"); + } + break; + case "31": //31加待入：入库分配、移库移入 + if (jo_in != null) { + jo_in.put("warehousing_qty", jo_in.getDoubleValue("warehousing_qty") + change_qty); + wql.update(jo_in, "stockrecord_id='" + jo_in.getString("stockrecord_id") + "'"); + } else { + from.put("canuse_qty", "0"); + from.put("ivt_qty", "0"); + from.put("frozen_qty", "0"); + from.put("warehousing_qty", change_qty); + this.createStor(from); + } + break; + case "32": //32减待入：入库分配取消、移库移入取消 + if (jo_in != null) { + jo_in.put("warehousing_qty", NumberUtil.sub(jo_in.getDoubleValue("warehousing_qty"),change_qty)); + if (jo_in.getDoubleValue("warehousing_qty") < 0) { + throw new BadRequestException("待入数不允许为负数！"); + } + wql.update(jo_in, "stockrecord_id='" + jo_in.getString("stockrecord_id") + "'"); + } else { + throw new BadRequestException(struct_id_In + "仓位库存异常，请检查"); + } + break; + case "33": //33减待入、加库存、加可用：入库确认、移库移入确认 + if (jo_in != null) { + jo_in.put("ivt_qty", jo_in.getDoubleValue("ivt_qty") + change_qty); + double ivt_qty = jo_in.getDoubleValue("ivt_qty"); + jo_in.put("canuse_qty", jo_in.getDoubleValue("canuse_qty") + change_qty); + jo_in.put("warehousing_qty", NumberUtil.sub(jo_in.getDoubleValue("warehousing_qty"),change_qty)); + + double ivt_num_now = jo_in.getDoubleValue("canuse_qty") + jo_in.getDoubleValue("frozen_qty"); + if (ivt_num_now != ivt_qty) { + throw new BadRequestException("输入数据异常，请检查"); + } + if (jo_in.getDoubleValue("warehousing_qty") < 0) { + throw new BadRequestException("待入数不允许为负数！"); + } + wql.update(jo_in, "stockrecord_id='" + jo_in.getString("stockrecord_id") + "'"); + } else { + throw new BadRequestException(struct_id_In + "仓位库存异常，请检查"); + } + break; + case "34": //34加待入、减库存、减可用：入库确认取消、移库移入确认取消 + if (jo_in != null) { + jo_in.put("ivt_qty", NumberUtil.sub(jo_in.getDoubleValue("ivt_qty"),change_qty)); + double ivt_qty = jo_in.getDoubleValue("ivt_qty"); + jo_in.put("canuse_qty", NumberUtil.sub(jo_in.getDoubleValue("canuse_qty"),change_qty)); + jo_in.put("warehousing_qty", jo_in.getDoubleValue("warehousing_qty") + change_qty); + + double ivt_num_now = jo_in.getDoubleValue("canuse_qty") + jo_in.getDoubleValue("frozen_qty"); + if (ivt_num_now != ivt_qty) { + throw new BadRequestException("输入数据异常，请检查"); + } + if (jo_in.getDoubleValue("ivt_qty") < 0) { + throw new BadRequestException("库存数不允许为负数！"); + } + if (jo_in.getDoubleValue("canuse_qty") < 0) { + throw new BadRequestException("可用数不允许为负数！"); + } + wql.update(jo_in, "stockrecord_id='" + jo_in.getString("stockrecord_id") + "'"); + } else { + throw new BadRequestException(struct_id_In + "仓位库存异常，请检查"); + } + break; + default: + throw new BadRequestException("变动类型不存在:" + change_type_scode); + } + if(jo_in!=null) { + if (jo_in.getDoubleValue("ivt_qty") == 0 && jo_in.getDoubleValue("canuse_qty") == 0 && jo_in.getDoubleValue("warehousing_qty") == 0) { + wql.delete(sql_where.toString()); + } + // 更新库存变动日志 + jo_in.put("result_qty", jo_in.getDoubleValue("ivt_qty")); + jo_in.put("change_type_scode", change_type_scode); + jo_in.put("bill_type_scode", from.getString("bill_type_scode")); + jo_in.put("inv_id", from.getString("inv_id")); + jo_in.put("bill_code", from.getString("bill_code")); + jo_in.put("bill_table", from.getString("bill_table")); + jo_in.put("change_qty", from.getString("change_qty")); + // 查询货位信息 + JSONObject jo = WQL.getWO("ST_PUB_QUERY_01") + .addParam("flag", "1") + .addParam("id", from.getString("struct_id")) + .process().uniqueResult(0); + if (jo == null) { + throw new BadRequestException("仓位不存在或者未启用：" + from.getString("struct_id")); + } + jo_in.put("stor_code", jo.getString("stor_code")); + jo_in.put("stor_id", jo.getString("stor_id")); + this.createStructIvtFlow(jo_in); + } +} + + @Override + public void updateStructAndPoint(JSONObject from) { + //货位表 + WQLObject wo_Struct = WQLObject.getWQLObject("ST_IVT_StructAttr"); + //点位表 + WQLObject wo_Point = WQLObject.getWQLObject("SCH_BASE_Point"); + //载具表 + WQLObject wo_Storage = WQLObject.getWQLObject("MD_PB_StorageVehicleInfo"); + //载具表 + WQLObject bucketrecord = WQLObject.getWQLObject("md_pb_bucketrecord"); + String struct_id = from.getString("struct_id"); + String point_code = from.getString("point_code"); + //锁定类型 + String lock_type = from.getString("lock_type"); + //载具编码 + String storagevehicle_code = from.getString("storagevehicle_code"); + if (StrUtil.isEmpty(struct_id) && StrUtil.isEmpty(point_code)) { + throw new BadRequestException("点位仓位更新出入参数异常！"); + } + if (StrUtil.isEmpty(lock_type)) { + throw new BadRequestException("点位仓位更新出入参数异常！"); + } + JSONObject jo = WQL.getWO("ST_PUB_QUERY_01") + .addParam("flag", "3") + .addParam("id", struct_id) + .addParam("point_code", point_code) + .process().uniqueResult(0); + if(jo==null){ + throw new BadRequestException("点位仓位更新未查询到符合条件的点位仓位！"); + } + HashMap map = new HashMap<>(); + if(lock_type.equals("00")){//解锁 + map.put("lock_type",lock_type); + map.put("taskdtl_type",""); + map.put("taskdtl_id",""); + map.put("task_code",""); + map.put("inv_type",""); + map.put("inv_id",""); + map.put("inv_code",""); + String area_type = jo.getString("area_type"); + //是否清空载具 + if("1".equals(from.getString("is_free"))){ + map.put("storagevehicle_code",""); + map.put("vehicle_code",""); + map.put("point_status","00"); + map.put("storagevehicle_qty","0"); + map.put("storagevehicle_type",""); + map.put("storagevehicle_id",""); + map.put("is_emptyvehicle","0"); + }else{ + if (StrUtil.isNotEmpty(storagevehicle_code)) { + JSONObject Storage = wo_Storage.query("storagevehicle_code='"+storagevehicle_code+"'").uniqueResult(0); + if(ObjectUtil.isEmpty(Storage)){ + throw new BadRequestException(storagevehicle_code+"载具参数异常！"); + } + map.put("storagevehicle_code",Storage.getString("storagevehicle_code")); + map.put("storagevehicle_qty","1"); + map.put("storagevehicle_type",Storage.getString("storagevehicle_type")); + map.put("storagevehicle_id",Storage.getString("storagevehicle_id")); + map.put("vehicle_code",Storage.getString("storagevehicle_code")); + map.put("point_status","01"); + JSONArray bus = bucketrecord.query("storagevehicle_code='"+storagevehicle_code+"'").getResultJSONArray(0); + if(bus.size()>0){ + map.put("point_status","02"); + map.put("is_emptyvehicle","0"); + }else{ + map.put("is_emptyvehicle","1"); + } + }else{ + map.put("is_emptyvehicle","0"); + if(StrUtil.isNotEmpty(jo.getString("storagevehicle_code"))){ + String storagevehicle = jo.getString("storagevehicle_code"); + JSONArray bus = bucketrecord.query("storagevehicle_code='"+storagevehicle+"'").getResultJSONArray(0); + if(bus.size()>0){ + map.put("is_emptyvehicle","0"); + }else{ + map.put("is_emptyvehicle","1"); + } + } + } + } + //区域类型非输送线才需解锁 + if(!area_type.equals("21")){ + wo_Point.update(map,"point_id='"+jo.getString("point_id")+"'"); + wo_Struct.update(map,"struct_id='"+jo.getString("struct_id")+"'"); + } + }else{//锁定 + map.put("lock_type",lock_type); + map.put("taskdtl_type",from.getString("taskdtl_type")); + map.put("taskdtl_id",from.getString("taskdtl_id")); + map.put("task_code",from.getString("task_code")); + map.put("inv_type",from.getString("inv_type")); + map.put("inv_id",from.getString("inv_id")); + map.put("inv_code",from.getString("inv_code")); + String area_type = jo.getString("area_type"); + if (StrUtil.isNotEmpty(storagevehicle_code)) { + JSONObject Storage = wo_Storage.query("storagevehicle_code='"+storagevehicle_code+"'").uniqueResult(0); + if(ObjectUtil.isEmpty(Storage)){ + throw new BadRequestException(storagevehicle_code+"载具参数异常！"); + } + map.put("storagevehicle_code",Storage.getString("storagevehicle_code")); + map.put("storagevehicle_qty","1"); + map.put("storagevehicle_type",Storage.getString("storagevehicle_type")); + map.put("storagevehicle_id",Storage.getString("storagevehicle_id")); + map.put("vehicle_code",Storage.getString("storagevehicle_code")); + map.put("point_status","01"); + JSONArray bus = bucketrecord.query("storagevehicle_code='"+storagevehicle_code+"'").getResultJSONArray(0); + if(bus.size()>0){ + map.put("point_status","02"); + map.put("is_emptyvehicle","0"); + }else{ + map.put("is_emptyvehicle","1"); + } + } + //区域类型非输送线才需解锁 + if(!area_type.equals("21")){ + wo_Point.update(map,"point_id='"+jo.getString("point_id")+"'"); + wo_Struct.update(map,"struct_id='"+jo.getString("struct_id")+"'"); + } + } + } + +} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/wql/QST_IVT_RAWASSISTISTOR.wql b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/wql/QST_IVT_RAWASSISTISTOR.wql new file mode 100644 index 000000000..f6c1a9f06 --- /dev/null +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/wql/QST_IVT_RAWASSISTISTOR.wql @@ -0,0 +1,394 @@ +[交易说明] + 交易名： 基础点位分页查询 + 所属模块： + 功能简述： + 版权所有： + 表引用： + 版本经历： + +[数据库] + --指定数据库，为空采用默认值，默认为db.properties中列出的第一个库 + +[IO定义] + ################################################# + ## 表字段对应输入参数 + ################################################# + 输入.flag TYPEAS s_string + 输入.begin_time TYPEAS s_string + 输入.end_time TYPEAS s_string + 输入.material_search TYPEAS s_string + 输入.bill_code TYPEAS s_string + 输入.create_mode TYPEAS s_string + 输入.stor_id TYPEAS s_string + 输入.bill_status TYPEAS s_string + 输入.bill_type TYPEAS s_string + 输入.container_name TYPEAS s_string + 输入.package_box_sn TYPEAS s_string + + +[临时表] + --这边列出来的临时表就会在运行期动态创建 + +[临时变量] + --所有中间过程变量均可在此处定义 + +[业务过程] + + ########################################## + # 1、输入输出检查 # + ########################################## + + + ########################################## + # 2、主过程前处理 # + ########################################## + + + ########################################## + # 3、业务主过程 # + ########################################## + + IF 输入.flag = "1" + PAGEQUERY + SELECT + ios.* + FROM + ST_IVT_IOStorInv ios + WHERE + ios.is_delete = '0' + OPTION 输入.bill_code <> "" + ios.bill_code like 输入.bill_code + ENDOPTION + OPTION 输入.stor_id <> "" + ios.stor_id = 输入.stor_id + ENDOPTION + OPTION 输入.bill_type <> "" + ios.bill_type = 输入.bill_type + ENDOPTION + OPTION 输入.create_mode <> "" + ios.create_mode = 输入.create_mode + ENDOPTION + OPTION 输入.bill_status <> "" + ios.bill_status = 输入.bill_status + ENDOPTION + OPTION 输入.begin_time <> "" + ios.input_time >= 输入.begin_time + ENDOPTION + OPTION 输入.end_time <> "" + ios.input_time <= 输入.end_time + ENDOPTION + ENDSELECT + ENDPAGEQUERY + ENDIF + + IF 输入.flag = "2" + PAGEQUERY + SELECT + sale_order_name, + customer_name, + customer_description, + package_box_sn, + quanlity_in_box, + container_name, + product_name, + product_description, + width, + thickness, + net_weight + FROM + pdm_bi_subpackagerelation sub + WHERE + sub.status = '0' + OPTION 输入.begin_time <> "" + sub.date_of_FG_inbound >= 输入.begin_time + ENDOPTION + OPTION 输入.end_time <> "" + sub.date_of_FG_inbound <= 输入.begin_time + ENDOPTION + OPTION 输入.bill_code <> "" + sub.sale_order_name = 输入.bill_code + ENDOPTION + OPTION 输入.package_box_sn <> "" + sub.package_box_sn = 输入.package_box_sn + ENDOPTION + OPTION 输入.container_name <> "" + sub.container_name = 输入.container_name + ENDOPTION + OPTION 输入.material_search <> "" + ( + sub.product_name like 输入.material_search + OR + sub.product_description like 输入.material_search + ) + ENDOPTION + ENDSELECT + ENDPAGEQUERY + ENDIF + + IF 输入.flag = "3" + QUERY + SELECT DISTINCT + dtl.* , + mb.material_code, + mb.material_name, + mst.bill_code + FROM + st_ivt_iostorinvdtl dtl + LEFT JOIN md_me_materialbase mb ON mb.material_id = dtl.material_id + LEFT JOIN ST_IVT_IOStorInv mst ON mst.iostorinv_id = dtl.iostorinv_id + where + mst.bill_code = 输入.bill_code + OPTION 输入.open_flag = "1" + dtl.bill_status < '40' + ENDOPTION + OPTION 输入.open_flag = "2" + dtl.bill_status IN ('30','40') + ENDOPTION + ENDSELECT + ENDQUERY + ENDIF + + IF 输入.flag = "4" + QUERY + SELECT + dis.*, + mb.material_code, + mb.material_name, + FROM + st_ivt_iostorinvdis dis + INNER JOIN md_me_materialbase mb ON mb.material_id = dis.material_id + where + dis.box_no = 输入.package_box_sn + AND + dis.iostorinv_id = 输入.iostorinv_id + ENDSELECT + ENDQUERY + ENDIF + + IF 输入.flag = "5" + QUERY + SELECT + dis.iostorinv_id, + dis.material_id, + mb.material_code, + mb.material_name, + dis.pcsn, + dis.seq_no, + dis.storagevehicle_code, + (case when dtl.bucket_num is null then 0 else dtl.bucket_num end) AS bucket_num, + dis.plan_qty, + dis.struct_code, + dis.struct_code AS new_struct_code, + task.task_status AS work_status, + task.task_code, + dis.point_code, + dis.point_code AS new_point_code, + dis.point_name, + dis.iostorinvdis_id, + dis.task_id, + task.taskdtl_id + FROM + st_ivt_iostorinvdis dis + INNER JOIN md_me_materialbase mb ON mb.material_id = dis.material_id + LEFT JOIN ( + SELECT COUNT(disdtl.iostorinvdisdtl_id) AS bucket_num,iostorinvdis_id from st_ivt_iostorinvdisdtl disdtl GROUP BY disdtl.iostorinvdis_id + ) dtl ON dtl.iostorinvdis_id = dis.iostorinvdis_id + LEFT JOIN sch_base_task task ON task.task_id = dis.task_id AND task.is_delete = '0' + WHERE + dis.task_id <> '' + AND + dis.task_id is not null + AND + dis.iostorinvdtl_id = 输入.iostorinvdtl_id + OPTION 输入.is_finish = "1" + dis.work_status < '99' AND task.task_status < '99' + ENDOPTION + ENDSELECT + ENDQUERY + ENDIF + + IF 输入.flag = "6" + QUERY + SELECT + bucket.*, + detail.label, + mb.material_code, + mb.material_name + FROM + st_ivt_iostorinvdisdtl disdtl + LEFT JOIN md_pb_bucketrecord bucket ON bucket.bucketunique = disdtl.bucketunique + LEFT JOIN sys_dict_detail detail ON detail.`value` = bucket.storagevehicle_type + INNER JOIN sys_dict dict ON dict.dict_id = detail.dict_id + AND dict.`name` LIKE 'MD_BUCKET_TYPE%' + INNER JOIN md_me_materialbase mb ON mb.material_id = bucket.material_id + WHERE + disdtl.storagevehicle_code = 输入.storagevehicle_code + AND + disdtl.iostorinv_id = 输入.iostorinv_id + ENDSELECT + ENDQUERY + ENDIF + + IF 输入.flag = "7" + QUERY + SELECT DISTINCT + sa.* + FROM + st_ivt_structattr sa + LEFT JOIN st_ivt_sectattr se ON se.sect_id = sa.sect_id + LEFT JOIN st_ivt_structrelamaterial sm ON sm.sect_id = sa.sect_id + WHERE + se.sect_type_attr = '00' + AND sa.lock_type = '00' + AND sa.is_used = '1' + AND sa.is_delete = '0' + AND ( sa.storagevehicle_code IS NULL OR sa.storagevehicle_code = '' ) + AND sa.height = 输入.height + OPTION 输入.sect_flag = "1" + sm.material_type_id = 输入.material_type_id + ENDOPTION + OPTION 输入.sect_id <> "" + sa.sect_id = 输入.sect_id + ENDOPTION + OPTION 输入.stor_id <> "" + sa.stor_id = 输入.stor_id + ENDOPTION + order by sa.struct_code + ENDSELECT + ENDQUERY + ENDIF + + IF 输入.flag = "8" + PAGEQUERY + SELECT + pp.CREATE_DATE AS receive_date, + pp.VBILLCODE AS source_bill_code, + mb.material_code, + mb.material_name, + class.class_desc, + mb.material_id, + pp.QTY AS receive_qty, + ( CASE WHEN a.real_qty IS NULL THEN pp.QTY ELSE ( pp.QTY - a.real_qty ) END ) AS need_qty, + mu.unit_name AS qty_unit_name, + '采购订单' AS source_type_name, + mu.measure_unit_id AS qty_unit_id, + pp.id AS source_billdtl_id, + 'PO' AS source_bill_type, + 'PCS_IF_PurchaseOrderProc' AS source_bill_table, + pp.id AS base_billdtl_id, + 'PO' AS base_bill_type, + '' AS base_bill_code, + 'PCS_IF_PurchaseOrderProc' AS base_bill_table + FROM + pcs_if_purchaseorderproc pp + LEFT JOIN md_me_materialbase mb ON mb.ext_id = pp.ITEM_ID + INNER JOIN md_pb_classstandard class ON class.class_id = mb.material_type_id + INNER JOIN md_pb_measureunit mu ON mu.ext_id = pp.M_UNIT_ID + LEFT JOIN ( SELECT dtl.source_billdtl_id, SUM( dtl.real_qty ) AS real_qty FROM st_ivt_iostorinvdtl dtl GROUP BY source_billdtl_id ) a ON a.source_billdtl_id = pp.id + WHERE + pp.proc_status IN ( '01', '02' ) + AND + pp.DR='0' + AND + mb.material_type_id IN 输入.clsss_ids + OPTION 输入.material_search <> "" + (mb.material_code like 输入.material_search + OR + mb.material_name like 输入.material_search) + ENDOPTION + OPTION 输入.bill_code <> "" + pp.VBILLCODE like 输入.bill_code + ENDOPTION + OPTION 输入.begin_time <> "" + pp.CREATE_DATE >= 输入.begin_time + ENDOPTION + OPTION 输入.end_time <> "" + pp.CREATE_DATE <= 输入.end_time + ENDOPTION + ENDSELECT + ENDPAGEQUERY + ENDIF + + IF 输入.flag = "9" + PAGEQUERY + SELECT + mst.input_time AS receive_date, + mst.bill_code AS source_bill_code, + mb.material_code, + mb.material_name, + class.class_desc, + mb.material_id, + disdtl.pcsn, + disdtl.real_qty AS need_qty, + disdtl.qty_unit_name, + detail.label AS source_type_name, + disdtl.qty_unit_id, + disdtl.iostorinvdtl_id AS source_billdtl_id, + mst.bill_type AS source_bill_type, + 'st_ivt_iostorinvdtl' AS source_bill_table, + disdtl.bucketunique, + disdtl.storagevehicle_code, + disdtl.quality_scode, + disdtl.ivt_level, + disdtl.is_active, + dtl.base_billdtl_id, + dtl.base_bill_type, + dtl.base_bill_code, + dtl.base_bill_table + + FROM + st_ivt_iostorinvdisdtl disdtl + INNER JOIN st_ivt_iostorinv mst ON mst.iostorinv_id = disdtl.iostorinv_id + LEFT JOIN st_ivt_iostorinvdtl dtl ON dtl.iostorinvdtl_id = disdtl.iostorinvdtl_id + LEFT JOIN sys_dict_detail detail ON detail.`value` = mst.bill_type + LEFT JOIN sys_dict dict ON dict.dict_id = detail.dict_id + AND dict.`name` LIKE 'ST_INV_TYPE%' + INNER JOIN md_me_materialbase mb ON mb.material_id = disdtl.material_id + INNER JOIN md_pb_classstandard class ON class.class_id = mb.material_type_id + WHERE + mst.bill_status = '99' + AND mst.io_type = '0' + AND mst.bill_type not in ('000501','000401','000601') + OPTION 输入.material_search <> "" + (mb.material_code like 输入.material_search + OR + mb.material_name like 输入.material_search) + ENDOPTION + OPTION 输入.bill_code <> "" + mst.bill_code like 输入.bill_code + ENDOPTION + OPTION 输入.query_type <> "" + mst.bill_type = 输入.query_type + ENDOPTION + OPTION 输入.begin_time <> "" + mst.input_time >= 输入.begin_time + ENDOPTION + OPTION 输入.end_time <> "" + mst.input_time <= 输入.end_time + ENDOPTION + ENDSELECT + ENDPAGEQUERY + ENDIF + + IF 输入.flag = "10" + QUERY + SELECT + bucket.*, + mb.material_code, + '0' AS is_new, + '' AS bill_code + FROM + md_pb_bucketrecord bucket + LEFT JOIN md_me_materialbase mb ON mb.material_id = bucket.material_id + WHERE + bucket.status = '03' + AND + bucket.storagevehicle_code = 输入.storagevehicle_code + ENDSELECT + ENDQUERY + ENDIF + + + + + diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/wql/ST_PUB_QUERY_01.wql b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/wql/ST_PUB_QUERY_01.wql new file mode 100644 index 000000000..6683df235 --- /dev/null +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/wql/ST_PUB_QUERY_01.wql @@ -0,0 +1,145 @@ +[交易说明] + 交易名： 物料更新接口 + 所属模块： + 功能简述： + 版权所有： + 表引用： + 版本经历： + +[数据库] + --指定数据库，为空采用默认值，默认为db.properties中列出的第一个库 + +[IO定义] + ################################################# + ## 表字段对应输入参数 + ################################################# + //sql类型 + 输入.flag TYPEAS s_string + // + 输入.id TYPEAS s_string + // + 输入.material_id TYPEAS s_string + // + 输入.point_code TYPEAS s_string + // + 输入.ids TYPEAS f_string +[临时表] + --这边列出来的临时表就会在运行期动态创建 + +[临时变量] + --所有中间过程变量均可在此处定义 + +[业务过程] + + ########################################## + # 1、输入输出检查 # + ########################################## + + + ########################################## + # 2、主过程前处理 # + ########################################## + + + ########################################## + # 3、业务主过程 # + ########################################## + + IF 输入.flag = "1" + QUERY + SELECT + struct.struct_id, + struct.struct_name, + struct.struct_code, + struct.sect_id, + struct.sect_name, + struct.stor_id, + struct.stor_code, + struct.stor_name, + sect.sect_code + FROM + ST_IVT_StructAttr struct + left join ST_IVT_SectAttr sect on sect.sect_id=struct.sect_id + WHERE + struct.is_delete = '0' + AND struct.is_used = '1' + AND sect.is_used='1' + OPTION 输入.id <> "" + struct.struct_id = 输入.id + ENDOPTION + ENDSELECT + ENDQUERY + ENDIF + + IF 输入.flag = "2" + QUERY + SELECT + mater.material_id + FROM + md_me_materialbase mater + WHERE + mater.is_delete = '0' + AND mater.is_used = '1' + OPTION 输入.material_id <> "" + mater.material_id = 输入.material_id + ENDOPTION + ENDSELECT + ENDQUERY + ENDIF + + IF 输入.flag = "3" + QUERY + SELECT + struct.struct_id, + struct.struct_code, + point.point_code, + point.point_id, + point.area_type, + struct.storagevehicle_code + FROM + SCH_BASE_Point point + left join ST_IVT_StructAttr struct on point.source_id=struct.struct_id + WHERE 1=1 + OPTION 输入.id <> "" + struct.struct_id = 输入.id + ENDOPTION + OPTION 输入.point_code <> "" + point.point_code = 输入.point_code + ENDOPTION + ENDSELECT + ENDQUERY + ENDIF + + IF 输入.flag = "4" + QUERY + SELECT + max(detail.VALUE) AS CODE, + max(detail.label) AS NAME + FROM + sys_dict_detail detail + LEFT JOIN sys_dict dict ON dict.dict_id = detail.dict_id + WHERE + 1 = 1 + AND dict. NAME LIKE '%INV_TYPE%' + group by detail.VALUE + ENDSELECT + ENDQUERY + ENDIF + + IF 输入.flag = "5" + QUERY + SELECT + detail.VALUE, + detail.label + FROM + sys_dict_detail detail + inner JOIN sys_dict dict ON dict.dict_id = detail.dict_id and dict.dict_id='6' + WHERE + 1 = 1 + OPTION 输入.ids <> "" + detail.VALUE in (输入.ids) + ENDOPTION + order by detail.dict_sort + ENDSELECT + ENDQUERY + ENDIF diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/rest/CheckOutBillController.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/rest/CheckOutBillController.java new file mode 100644 index 000000000..30a1858c7 --- /dev/null +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/rest/CheckOutBillController.java @@ -0,0 +1,190 @@ +package org.nl.wms.st.outbill.rest; + +import com.alibaba.fastjson.JSONObject; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.nl.modules.logging.annotation.Log; +import org.nl.wms.st.inbill.service.CheckOutBillService; +import org.springframework.data.domain.Pageable; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; + +import java.util.Map; + +@RestController +@RequiredArgsConstructor +@Api(tags = "检验出库") +@RequestMapping("/api/checkoutbill") +@Slf4j +public class CheckOutBillController { + private final CheckOutBillService checkOutBillService; + + @GetMapping + @Log("查询出库单") + @ApiOperation("查询出库单") + //@PreAuthorize("@el.check('checkoutbill:list')") + public ResponseEntity query(@RequestParam Map whereJson, Pageable page){ + return new ResponseEntity<>(checkOutBillService.pageQuery(whereJson,page), HttpStatus.OK); + } + + @GetMapping("/addDtl") + @Log("查询出库单") + @ApiOperation("查询出库单") + //@PreAuthorize("@el.check('checkoutbill:list')") + public ResponseEntity queryAddDtl(@RequestParam Map whereJson, Pageable page){ + return new ResponseEntity<>(checkOutBillService.queryAddDtl(whereJson,page), HttpStatus.OK); + } + + @GetMapping("/queryDtl") + @Log("查询出库单") + @ApiOperation("查询出库单") + //@PreAuthorize("@el.check('checkoutbill:list')") + public ResponseEntity queryDtl(@RequestParam Map whereJson, Pageable page){ + return new ResponseEntity<>(checkOutBillService.queryDtl(whereJson,page), HttpStatus.OK); + } + + @GetMapping("/getOutBillDtl") + @Log("查询出库单") + @ApiOperation("查询出库单") + public ResponseEntity getOutBillDtl(@RequestParam Map whereJson){ + return new ResponseEntity<>(checkOutBillService.getOutBillDtl(whereJson), HttpStatus.OK); + } + @Log("删除出库单") + @ApiOperation("删除出库单") + //@PreAuthorize("@el.check('checkoutbill:del')") + @DeleteMapping + public ResponseEntity delete(@RequestBody Long[] ids) { + checkOutBillService.deleteAll(ids); + return new ResponseEntity<>(HttpStatus.OK); + } + + @PutMapping + @Log("修改出库单") + @ApiOperation("修改出库单") + public ResponseEntity update(@RequestBody Map whereJson){ + checkOutBillService.update(whereJson); + return new ResponseEntity<>(HttpStatus.NO_CONTENT); + } + @PostMapping() + @Log("新增出库单") + @ApiOperation("新增出库单") + public ResponseEntity insertDtl(@RequestBody Map whereJson){ + checkOutBillService.insertDtl(whereJson); + return new ResponseEntity<>(HttpStatus.CREATED); + } + @PostMapping("/allDiv") + @Log("出库单全部分配") + @ApiOperation("出库单全部分配") + public ResponseEntity allDiv(@RequestBody JSONObject whereJson) { + checkOutBillService.allDiv(whereJson); + return new ResponseEntity<>(HttpStatus.NO_CONTENT); + } + @PostMapping("/allCancel") + @Log("出库单全部取消") + @ApiOperation("出库单全部取消") + public ResponseEntity allCancel(@RequestBody JSONObject whereJson) { + checkOutBillService.allCancel(whereJson); + return new ResponseEntity<>(HttpStatus.NO_CONTENT); + } + @GetMapping("/getOutBillDis") + @Log("查询出库单分配") + @ApiOperation("查询出库单分配") + public ResponseEntity getOutBillDis(@RequestParam Map whereJson){ + return new ResponseEntity<>(checkOutBillService.getOutBillDis(whereJson), HttpStatus.OK); + } + @GetMapping("/getOutBillDisDtl") + @Log("查询出库单分配") + @ApiOperation("查询出库单分配") + public ResponseEntity getOutBillDisDtl(@RequestParam Map whereJson){ + return new ResponseEntity<>(checkOutBillService.getOutBillDisDtl(whereJson), HttpStatus.OK); + } + @PostMapping("/setPoint") + @Log("设置检验站点") + @ApiOperation("设置检验站点") + public ResponseEntity setPoint(@RequestBody JSONObject whereJson) { + checkOutBillService.setPoint(whereJson); + return new ResponseEntity<>(HttpStatus.NO_CONTENT); + } + @GetMapping("/getOutBillTask") + @Log("查询出库单分配任务") + @ApiOperation("查询出库单分配任务") + public ResponseEntity getOutBillTask(@RequestParam Map whereJson){ + return new ResponseEntity<>(checkOutBillService.getOutBillTask(whereJson), HttpStatus.OK); + } + @GetMapping("/getStructIvt") + @Log("查询可分配库存") + @ApiOperation("查询可分配库存") + public ResponseEntity getStructIvt(@RequestParam Map whereJson){ + return new ResponseEntity<>(checkOutBillService.getStructIvt(whereJson), HttpStatus.OK); + } + @PostMapping("/manualDiv") + @Log("出库单手动分配") + @ApiOperation("出库单手动分配") + public ResponseEntity manualDiv(@RequestBody JSONObject whereJson) { + checkOutBillService.manualDiv(whereJson); + return new ResponseEntity<>(HttpStatus.NO_CONTENT); + } + @PostMapping("/confirm") + @Log("出库单强制确认") + @ApiOperation("出库单强制确认") + public ResponseEntity confirm(@RequestBody JSONObject whereJson) { + checkOutBillService.confirm(whereJson); + return new ResponseEntity<>(HttpStatus.NO_CONTENT); + } + @PostMapping("/issueTask") + @Log("出库任务下发") + @ApiOperation("出库任务下发") + public ResponseEntity issueTask(@RequestBody JSONObject whereJson) { + checkOutBillService.issueTask(whereJson); + return new ResponseEntity<>(HttpStatus.NO_CONTENT); + } + @PostMapping("/finishTask") + @Log("出库任务手动完成") + @ApiOperation("出库任务手动完成") + public ResponseEntity finishTask(@RequestBody JSONObject whereJson) { + checkOutBillService.finishTask(whereJson); + return new ResponseEntity<>(HttpStatus.NO_CONTENT); + } + @PostMapping("/cancleTaskfinish") + @Log("出库任务手动取消完成") + @ApiOperation("出库任务手动取消完成") + public ResponseEntity cancleTaskfinish(@RequestBody JSONObject whereJson) { + checkOutBillService.cancleTaskfinish(whereJson); + return new ResponseEntity<>(HttpStatus.NO_CONTENT); + } + @GetMapping("/getInvTypes") + @Log("查询单据字段") + @ApiOperation("查询单据字段") + public ResponseEntity getInvTypes(){ + return new ResponseEntity<>(checkOutBillService.getInvTypes(), HttpStatus.OK); + } + + @PostMapping("/paramByCodeType") + @Log("查询出库单物料是否限制参数") + @ApiOperation("查询出库单物料是否限制参数") + public ResponseEntity paramByCodeType(@RequestBody JSONObject whereJson){ + return new ResponseEntity<>(checkOutBillService.getParamByCodeType(whereJson), HttpStatus.OK); + } + @PostMapping("/schAreaType") + @Log("查询点位区域类型") + @ApiOperation("查询点位区域类型") + public ResponseEntity schAreaType(@RequestBody JSONObject whereJson) { + return new ResponseEntity<>(checkOutBillService.schAreaType(whereJson), HttpStatus.OK); + } + @PostMapping("/backConfirm") + @Log("出库单强制确认") + @ApiOperation("出库单强制确认") + public ResponseEntity backConfirm(@RequestBody JSONObject whereJson) { + checkOutBillService.backConfirm(whereJson); + return new ResponseEntity<>(HttpStatus.NO_CONTENT); + } + @GetMapping("/getType") + @Log("获取全部出入库业务类型") + @ApiOperation("获取全部出入库业务类型") + public ResponseEntity getType() { + return new ResponseEntity<>(checkOutBillService.getType(),HttpStatus.OK); + } +} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java new file mode 100644 index 000000000..2fe9bf32d --- /dev/null +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java @@ -0,0 +1,1279 @@ +package org.nl.wms.st.outbill.service.impl; + +import cn.hutool.core.date.DateUtil; +import cn.hutool.core.map.MapUtil; +import cn.hutool.core.util.IdUtil; +import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.StrUtil; +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.nl.modules.common.exception.BadRequestException; +import org.nl.modules.common.utils.SecurityUtils; +import org.nl.modules.system.util.CodeUtil; +import org.nl.modules.wql.WQL; +import org.nl.modules.wql.core.bean.WQLObject; +import org.nl.modules.wql.util.WqlUtil; +import org.nl.wms.sch.manage.TaskStatusEnum; +import org.nl.wms.sch.service.dto.TaskDto; +import org.nl.wms.st.inbill.service.CheckOutBillService; +import org.nl.wms.st.inbill.service.StorPublicService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.domain.Pageable; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.*; + +/** + * PC端出入库新增 + */ +@Service +@RequiredArgsConstructor +@Slf4j +public class CheckOutBillServiceImpl implements CheckOutBillService { + + private StorPublicService storPublicService; + + @Override + public Map pageQuery(Map whereJson, Pageable page) { + HashMap map = new HashMap<>(whereJson); + map.put("flag", "1"); + + if (StrUtil.isNotEmpty(map.get("bill_code"))) { + map.put("bill_code", "%" + map.get("bill_code") + "%"); + } + if (StrUtil.isNotEmpty(map.get("buss_type"))) { + map.put("buss_type", whereJson.get("buss_type") + "%"); + } + if (StrUtil.isNotEmpty(map.get("io_type"))) { + map.put("io_type", map.get("io_type")); + } + if (StrUtil.isNotEmpty(map.get("pcsn"))) { + map.put("pcsn", "%" + map.get("pcsn") + "%"); + } + if (StrUtil.isNotEmpty(map.get("material_code"))) { + map.put("material_code", "%" + map.get("material_code") + "%"); + } + JSONObject jo = WQL.getWO("QST_IVT_CHECKOUTBILL").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "bill_code desc"); + return jo; + } + + @Override + public Map queryAddDtl(Map whereJson, Pageable page) { + HashMap map = new HashMap<>(whereJson); + map.put("flag", "7"); + + if (StrUtil.isNotEmpty(map.get("bill_code"))) { + map.put("bill_code", "%" + map.get("bill_code") + "%"); + } + if (StrUtil.isNotEmpty(map.get("remark"))) { + map.put("remark", "%" + map.get("remark") + "%"); + } + JSONObject jo = WQL.getWO("QST_IVT_CHECKOUTBILL").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), ""); + return jo; + } + + @Override + public Map queryDtl(Map whereJson, Pageable page) { + HashMap map = new HashMap<>(whereJson); + map.put("flag", "12"); + + if (StrUtil.isNotEmpty(map.get("material_code"))) { + map.put("material_code", "%" + map.get("material_code") + "%"); + } + if (StrUtil.isNotEmpty(map.get("username"))) { + map.put("username", "%" + map.get("username") + "%"); + } + if (StrUtil.isNotEmpty(map.get("pcsn"))) { + map.put("pcsn", "%" + map.get("pcsn") + "%"); + } + String begin_time = map.get("begin_time"); + if (StrUtil.isNotEmpty(begin_time)) { + map.put("begin_time", begin_time.substring(0,10)); + } + String end_time = map.get("end_time"); + if (StrUtil.isNotEmpty(end_time)) { + map.put("end_time", end_time.substring(0,10)); + } + String source_bill_code = map.get("source_bill_code"); + if (StrUtil.isNotEmpty(source_bill_code)) { + StringBuilder sb = new StringBuilder(); + String[] strs = source_bill_code.split(","); + for(int i=0;i map = new HashMap<>(); + map.put("is_delete", "1"); + map.put("update_optid", currentUserId + ""); + map.put("update_optname", nickName); + map.put("update_time", now); + wo.update(map, "iostorinv_id='" + iostorinv_id + "'"); + } + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void insertDtlByJson(JSONObject map) { + //明细另一种写法 + //JSONArray jsonArr = JSONArray.fromObject(whereJson.get("tableData")); + JSONArray rows = map.getJSONArray("tableData"); + map.remove("tableData"); + Long currentUserId = SecurityUtils.getCurrentUserId(); + String nickName = SecurityUtils.getCurrentNickName(); + String now = DateUtil.now(); + String iostorinv_id = IdUtil.getSnowflake(1, 1).nextId() + ""; + String bill_code = CodeUtil.getNewCode("IO_CODE"); + map.put("iostorinv_id", iostorinv_id); + map.put("bill_code", bill_code); + String bill_type = map.getString("bill_type"); + map.put("buss_type", bill_type.substring(0, 4)); + map.put("io_type", "1"); + map.put("detail_count", rows.size() + ""); + map.put("create_mode", "01"); + map.put("input_optid", currentUserId + ""); + map.put("input_optname", nickName); + map.put("input_time", now); + map.put("update_optid", currentUserId + ""); + map.put("update_optname", nickName); + map.put("update_time", now); + map.put("is_delete", "0"); + map.put("is_upload", "0"); + Long deptId = SecurityUtils.getDeptId(); + map.put("sysdeptid", deptId); + map.put("syscompanyid", deptId); + + for (int i = 0; i < rows.size(); i++) { + JSONObject row = rows.getJSONObject(i); + row.put("iostorinvdtl_id", IdUtil.getSnowflake(1, 1).nextId() + ""); + row.put("iostorinv_id", iostorinv_id); + row.put("seq_no", (i + 1) + ""); + row.put("assign_qty", "0"); + row.put("unassign_qty", row.get("plan_qty")); + WQLObject.getWQLObject("ST_IVT_IOStorInvDtl").insert(row); + } + WQLObject.getWQLObject("ST_IVT_IOStorInv").insert(map); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void insertDtl(Map map) { + //明细另一种写法 + //JSONArray jsonArr = JSONArray.fromObject(whereJson.get("tableData")); + ArrayList rows = (ArrayList) map.get("tableData"); + map.remove("tableData"); + Long currentUserId = SecurityUtils.getCurrentUserId(); + String nickName = SecurityUtils.getCurrentNickName(); + String now = DateUtil.now(); + String iostorinv_id = IdUtil.getSnowflake(1, 1).nextId() + ""; + String bill_code = CodeUtil.getNewCode("IO_CODE"); + + JSONObject jsonStor = WQLObject.getWQLObject("st_ivt_bsrealstorattr").query("stor_id ='" + MapUtil.getStr(map, "stor_id") + "'").uniqueResult(0); + map.put("iostorinv_id", iostorinv_id); + map.put("bill_code", bill_code); + String bill_type = (String) map.get("bill_type"); + map.put("buss_type", bill_type.substring(0, 4)); + map.put("io_type", "1"); + map.put("detail_count", rows.size() + ""); + map.put("create_mode", "01"); + map.put("stor_code", jsonStor.getString("stor_code")); + map.put("stor_name", jsonStor.getString("stor_name")); + map.put("input_optid", currentUserId + ""); + map.put("input_optname", nickName); + map.put("input_time", now); + map.put("update_optid", currentUserId + ""); + map.put("update_optname", nickName); + map.put("update_time", now); + map.put("is_delete", "0"); + map.put("is_upload", "0"); + Long deptId = SecurityUtils.getDeptId(); + map.put("sysdeptid", deptId); + map.put("syscompanyid", deptId); + + for (int i = 0; i < rows.size(); i++) { + HashMap row = rows.get(i); + row.put("iostorinvdtl_id", IdUtil.getSnowflake(1, 1).nextId() + ""); + row.put("iostorinv_id", iostorinv_id); + row.put("seq_no", (i + 1) + ""); + row.put("assign_qty", "0"); + row.put("unassign_qty", row.get("plan_qty")); + WQLObject.getWQLObject("ST_IVT_IOStorInvDtl").insert(row); + } + WQLObject.getWQLObject("ST_IVT_IOStorInv").insert(map); + } + + @Override + public JSONArray getOutBillDtl(Map whereJson) { + whereJson.put("flag", "2"); + JSONArray jo = WQL.getWO("QST_IVT_CHECKOUTBILL") + .addParamMap((HashMap) whereJson) + .process() + .getResultJSONArray(0); + return jo; + } + + @Override + public JSONArray getOutBillDis(Map whereJson) { + whereJson.put("flag", "5"); + JSONArray jo = WQL.getWO("QST_IVT_CHECKOUTBILL") + .addParamMap((HashMap) whereJson) + .process() + .getResultJSONArray(0); + return jo; + } + + @Override + public JSONArray getOutBillDisDtl(Map whereJson) { + whereJson.put("flag", "9"); + JSONArray jo = WQL.getWO("QST_IVT_CHECKOUTBILL") + .addParamMap((HashMap) whereJson) + .process() + .getResultJSONArray(0); + return jo; + } + + @Override + public JSONArray getOutBillTask(Map whereJson) { + HashMap map = new HashMap<>(whereJson); + map.put("flag", "10"); + if ("true".equals(map.get("checked"))) { + map.put("task_status", "99"); + } + JSONArray jo = new JSONArray(); + if (map.containsKey("iostorinvdtl_id")) { + jo = WQL.getWO("QST_IVT_CHECKOUTBILL") + .addParamMap(map) + .process() + .getResultJSONArray(0); + } + return jo; + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void update(Map whereJson) { + Long currentUserId = SecurityUtils.getCurrentUserId(); + String nickName = SecurityUtils.getCurrentNickName(); + + String now = DateUtil.now(); + whereJson.put("update_optid", currentUserId + ""); + whereJson.put("update_optname", nickName); + whereJson.put("update_time", now); + + WQLObject wo = WQLObject.getWQLObject("ST_IVT_IOStorInv"); + WQLObject wo_dtl = WQLObject.getWQLObject("ST_IVT_IOStorInvDtl"); + wo.update(whereJson); + //先删除该单据下的所有明细 + String iostorinv_id = (String) whereJson.get("iostorinv_id"); + wo_dtl.delete("iostorinv_id = '" + iostorinv_id + "'"); + ArrayList rows = (ArrayList) whereJson.get("tableData"); + for (int i = 0; i < rows.size(); i++) { + HashMap row = rows.get(i); + row.put("iostorinvdtl_id", IdUtil.getSnowflake(1, 1).nextId() + ""); + row.put("iostorinv_id", iostorinv_id); + row.put("seq_no", (i + 1) + ""); + row.put("bill_status", "10"); + row.put("assign_qty", "0"); + row.put("unassign_qty", row.get("plan_qty")); + WQLObject.getWQLObject("ST_IVT_IOStorInvDtl").insert(row); + } + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void allDiv(JSONObject whereJson) { + //出库分配表 + WQLObject wo_dis = WQLObject.getWQLObject("ST_IVT_IOStorInvDis"); + //出库明细表 + WQLObject wo_dtl = WQLObject.getWQLObject("ST_IVT_IOStorInvDtl"); + //出库主表 + WQLObject wo_mst = WQLObject.getWQLObject("ST_IVT_IOStorInv"); + + //定义需要更新的仓位集合 + HashMap Struct_map = new HashMap(); + String iostorinv_id = whereJson.getString("iostorinv_id"); + //查询主表信息 + JSONObject jo_mst = wo_mst.query("iostorinv_id = '" + iostorinv_id + "'").uniqueResult(0); + if (ObjectUtil.isEmpty(jo_mst)) { + throw new BadRequestException("查不到出库单信息"); + } + + //查询生成和未分配完的明细 + JSONArray dtls = WQL.getWO("QST_IVT_CHECKOUTBILL") + .addParam("flag", "2") + .addParam("bill_status", "30") + .addParam("unassign_flag", "1") + .addParam("iostorinv_id", iostorinv_id) + .addParam("iostorinvdtl_id", whereJson.getString("iostorinvdtl_id")) + .process() + .getResultJSONArray(0); + if (ObjectUtil.isEmpty(dtls)) { + throw new BadRequestException("当前订单无可分配出库明细"); + } + + for (int i = 0; i < dtls.size(); i++) { + JSONObject dtl = dtls.getJSONObject(i); + double unassign_qty = dtl.getDoubleValue("unassign_qty"); + double plan_qty = dtl.getDoubleValue("plan_qty"); + //查询符合条件的库存 + JSONArray ivts = WQL.getWO("QST_IVT_CHECKOUTBILL") + .addParam("flag", "3") + .addParam("material_id", dtl.getString("material_id")) + .addParam("quality_scode", dtl.getString("quality_scode")) + .addParam("pcsn", dtl.getString("pcsn")) + .addParam("ivt_level", dtl.getString("ivt_level")) + .addParam("is_active", dtl.getString("is_active")) + .addParam("iostorinv_id", whereJson.getString("iostorinv_id")) + .addParam("stor_id", whereJson.getString("stor_id")) + .addParam("sect_id", whereJson.getString("sect_id")) + .process() + .getResultJSONArray(0); + if (ivts.size() != 0) { + for (int j = 0; j < ivts.size(); j++) { + JSONObject ivt = ivts.getJSONObject(j); + double canuse_qty = ivt.getDoubleValue("canuse_qty"); + if (unassign_qty >= canuse_qty) { + unassign_qty = unassign_qty - canuse_qty; + ivt.put("change_qty", canuse_qty + ""); + } else { + ivt.put("change_qty", unassign_qty + ""); + unassign_qty = 0; + } + //更新库存 + ivt.put("bill_type_scode", jo_mst.getString("bill_type")); + ivt.put("inv_id", dtl.getString("iostorinv_id")); + ivt.put("bill_code", jo_mst.getString("bill_code")); + ivt.put("bill_table", "ST_IVT_IOStorInv"); + storPublicService.IOStor(ivt, "11"); + //生成分配明细 + dtl.put("iostorinvdis_id", IdUtil.getSnowflake(1, 1).nextId()); + dtl.put("sect_id", ivt.getString("sect_id")); + dtl.put("sect_code", ivt.getString("sect_code")); + dtl.put("sect_name", ivt.getString("sect_name")); + dtl.put("struct_id", ivt.getString("struct_id")); + dtl.put("struct_code", ivt.getString("struct_code")); + dtl.put("struct_name", ivt.getString("struct_name")); + dtl.put("pcsn", ivt.getString("pcsn")); + dtl.put("work_status", "00"); + dtl.put("storagevehicle_id", ivt.getString("storagevehicle_id")); + dtl.put("storagevehicle_code", ivt.getString("storagevehicle_code")); + dtl.put("storagevehicle_type", ivt.getString("storagevehicle_type")); + dtl.put("is_issued", "0"); + dtl.put("plan_qty", ivt.getDoubleValue("change_qty")); + dtl.put("real_qty", "0"); + wo_dis.insert(dtl); + //记录需锁定的仓位 + Struct_map.put(ivt.getString("struct_id"), ivt); + if (unassign_qty == 0) { + break; + } + } + HashMap map_dtl = new HashMap(); + //更新明细 + map_dtl.put("unassign_qty", unassign_qty + ""); + map_dtl.put("assign_qty", (plan_qty - unassign_qty) + ""); + if (unassign_qty == 0) { + map_dtl.put("bill_status", "40"); + } else { + map_dtl.put("bill_status", "30"); + } + wo_dtl.update(map_dtl, "iostorinvdtl_id='" + dtl.getString("iostorinvdtl_id") + "'"); + //更新主表状态 + this.updateMststatus(iostorinv_id); + //锁定起点点位、仓位 + Collection c = Struct_map.values(); + Iterator it = c.iterator(); + JSONObject from_start = new JSONObject(); + from_start.put("lock_type", "01"); + for (; it.hasNext(); ) { + JSONObject Struct = it.next(); + from_start.put("struct_id", Struct.getString("struct_id")); + from_start.put("inv_type", jo_mst.getString("bill_type")); + from_start.put("inv_id", jo_mst.getString("iostorinv_id")); + from_start.put("inv_code", jo_mst.getString("bill_code")); + storPublicService.updateStructAndPoint(from_start); + } + } else { + //对一条明细分配时，需要提示错误 + if (dtls.size() == 1) { + throw new BadRequestException("当前明细无可分配库存"); + } + } + } + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void allCancel(JSONObject whereJson) { + //出库分配表 + WQLObject wo_dis = WQLObject.getWQLObject("ST_IVT_IOStorInvDis"); + //出库明细表 + WQLObject wo_dtl = WQLObject.getWQLObject("ST_IVT_IOStorInvDtl"); + //出库主表 + WQLObject wo_mst = WQLObject.getWQLObject("ST_IVT_IOStorInv"); + //任务表 + WQLObject wo_Task = WQLObject.getWQLObject("SCH_BASE_Task"); + + String iostorinv_id = whereJson.getString("iostorinv_id"); + //查询主表信息 + JSONObject jo_mst = wo_mst.query("iostorinv_id = '" + iostorinv_id + "'").uniqueResult(0); + //查询未生成和生成未下发的分配记录 + JSONArray diss = WQL.getWO("QST_IVT_CHECKOUTBILL") + .addParam("flag", "5") + .addParam("iostorinvdtl_id", whereJson.getString("iostorinvdtl_id")) + .addParam("iostorinvdis_id", whereJson.getString("iostorinvdis_id")) + .addParam("task_id", whereJson.getString("task_id")) + .addParam("iostorinv_id", iostorinv_id) + .addParam("bill_status", "01") + .addParam("is_issued", "0") + .process() + .getResultJSONArray(0); + if (ObjectUtil.isEmpty(diss)) { + throw new BadRequestException("不存在可以取消的出库分配明细"); + } + for (int i = 0; i < diss.size(); i++) { + JSONObject dis = diss.getJSONObject(i); + HashMap map = new HashMap<>(); + + String iostorinvdtl_id = dis.getString("iostorinvdtl_id"); + //统计【出入库单分配表】执行状态大于等于执行中，或【任务指令表】任务状态大于等于下发时的记录和 + JSONArray dtl = WQL.getWO("QST_IVT_CHECKOUTBILL") + .addParam("flag", "4") + .addParam("iostorinvdtl_id", iostorinvdtl_id) + .process() + .getResultJSONArray(0); + //若存在记录，则不可取消该出库明细对应的任何分配记录 + if (dtl.size() != 0) { + throw new BadRequestException("存在出库明细对应任务执行中或完成！"); + } + double plan_qty = dis.getDoubleValue("plan_qty"); + //更新库存 + dis.put("change_qty", plan_qty + ""); + dis.put("bill_type_scode", jo_mst.getString("bill_type")); + dis.put("inv_id", iostorinv_id); + dis.put("bill_code", jo_mst.getString("bill_code")); + dis.put("bill_table", "ST_IVT_IOStorInv"); + storPublicService.IOStor(dis, "12"); + //删除【出入库单分配表】中分配记录 + wo_dis.delete("iostorinvdis_id='" + dis.getString("iostorinvdis_id") + "'"); + //更新【出入库单明细表】中分配记录 + JSONObject jo_dtl = wo_dtl.query("iostorinvdtl_id = '" + iostorinvdtl_id + "'").uniqueResult(0); + + jo_dtl.put("assign_qty", jo_dtl.getDoubleValue("assign_qty") - plan_qty); + jo_dtl.put("unassign_qty", jo_dtl.getDoubleValue("unassign_qty") + plan_qty); + + if (jo_dtl.getDoubleValue("unassign_qty") == jo_dtl.getDoubleValue("plan_qty")) { + jo_dtl.put("bill_status", "10"); + } else { + jo_dtl.put("bill_status", "30"); + } + wo_dtl.update(jo_dtl); + //更新主表状态 + this.updateMststatus(iostorinv_id); + //判断是否存在同单据的同起点仓位的分配 + JSONArray flag = WQL.getWO("QST_IVT_CHECKOUTBILL") + .addParam("flag", "5") + .addParam("is_issued", "0") + .addParam("struct_id", dis.getString("struct_id")) + .addParam("iostorinv_id", iostorinv_id) + .addParam("bill_status", "01") + .process() + .getResultJSONArray(0); + if (flag.size() == 0) {//仓位载具冻结数为0 + //任务号不为空 + if (ObjectUtil.isNotEmpty(dis.getString("task_id"))) { + //更新对应任务为删除 + map.put("is_delete", "1"); + wo_Task.update(map, "task_id='" + dis.getString("task_id") + "'"); + } + //解锁起点仓位点位 + JSONObject from_start = new JSONObject(); + from_start.put("struct_id", dis.getString("struct_id")); + from_start.put("lock_type", "00"); + storPublicService.updateStructAndPoint(from_start); + //解锁终点仓位点位 + if (StrUtil.isNotEmpty(dis.getString("point_code"))) { + JSONObject from_end = new JSONObject(); + from_end.put("point_code", dis.getString("point_code")); + from_end.put("lock_type", "00"); + storPublicService.updateStructAndPoint(from_end); + } + } else {//仓位载具扔有冻结数，需改任务类型为拣选出库 + //任务号不为空 + if (ObjectUtil.isNotEmpty(dis.getString("task_id"))) { + //更新对应任务为拣选出库 + map.put("taskdtl_type", "05"); + wo_Task.update(map, "task_id='" + dis.getString("task_id") + "'"); + } + } + } + + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void setPoint(JSONObject whereJson) { + //出库分配表 + WQLObject wo_dis = WQLObject.getWQLObject("ST_IVT_IOStorInvDis"); + //点位表 + WQLObject wo_Point = WQLObject.getWQLObject("SCH_BASE_Point"); + //任务表 + WQLObject wo_Task = WQLObject.getWQLObject("SCH_BASE_Task"); + //出库主表 + WQLObject wo_mst = WQLObject.getWQLObject("ST_IVT_IOStorInv"); + + String struct_id = whereJson.getString("struct_id"); + String point_code = whereJson.getString("point_code"); + String iostorinv_id = whereJson.getString("iostorinv_id"); + Long currentUserId = SecurityUtils.getCurrentUserId(); + String nickName = SecurityUtils.getCurrentNickName(); + String nowtime = DateUtil.now(); + //查询主表信息 + JSONObject jo_mst = wo_mst.query("iostorinv_id = '" + iostorinv_id + "'").uniqueResult(0); + if (ObjectUtil.isEmpty(jo_mst)) { + throw new BadRequestException("未查到相关出库单"); + } + JSONObject point = wo_Point.query("lock_type='00' and (vehicle_code='' or vehicle_code IS NULL) and point_code='" + point_code + "'").uniqueResult(0); + //如果终点站点被锁定或者有载具号，则不允许设置点位 + if (ObjectUtil.isEmpty(point)) { + throw new BadRequestException("该站点被锁定或者有载具号，不允许设置！"); + } + //查询未生成和生成未下发的分配记录 + JSONArray diss = WQL.getWO("QST_IVT_CHECKOUTBILL") + .addParam("flag", "5") + .addParam("iostorinvdtl_id", whereJson.getString("iostorinvdtl_id")) + .addParam("struct_id", struct_id) + .addParam("iostorinv_id", iostorinv_id) + .addParam("bill_status", "01") + .addParam("is_issued", "0") + .process() + .getResultJSONArray(0); + if (ObjectUtil.isEmpty(diss)) { + throw new BadRequestException("不存在可以设置站点的分配明细！"); + } + for (int i = 0; i < diss.size(); i++) { + JSONObject dis = diss.getJSONObject(i); + JSONObject disnow = wo_dis.query("work_status='00' and iostorinvdis_id='" + dis.getString("iostorinvdis_id") + "'").uniqueResult(0); + if (disnow == null) { + continue; + } + HashMap map = new HashMap(); + String work_status = dis.getString("work_status"); + String storagevehicle_code = dis.getString("storagevehicle_code"); + String task_status = dis.getString("task_status"); + String task_id = dis.getString("task_id"); + if ("02,99".contains(work_status) || (StrUtil.isNotEmpty(task_status) && "02,03,99".contains(task_status))) { + throw new BadRequestException("该载具任务已执行，不可重新设置站点！"); + } + JSONObject task = new JSONObject(); + if (!task_id.equals("")) {//若任务不为空，则为变更出库目的站点 + task = wo_Task.query("task_id='" + task_id + "'").uniqueResult(0); + //更新任务 + task.put("next_point_code", point.getString("point_code")); + wo_Task.update(task); + //解锁原终点 + JSONObject from_end = new JSONObject(); + from_end.put("point_code", dis.getString("point_code")); + from_end.put("lock_type", "00"); + storPublicService.updateStructAndPoint(from_end); + } else {//生成任务 + task = new JSONObject(); + task_id = IdUtil.getSnowflake(1, 1).nextId() + ""; + String task_code = CodeUtil.getNewCode("TASK_CODE"); + task.put("taskdtl_id", task_id); + task.put("task_id", task_id); + task.put("task_code", task_code); + task.put("task_type", "02"); + //默认拣选 + task.put("taskdtl_type", "05"); + //根据可用数是否为0设置拣选还是全出 + boolean flag = this.canuse_is_zero(dis.getString("struct_code")); + if (flag) { + task.put("taskdtl_type", "02"); + } + task.put("task_status", "01"); + task.put("start_point_code", dis.getString("start_point_code")); + task.put("next_point_code", point.getString("point_code")); + task.put("vehicle_code", dis.getString("storagevehicle_code")); + task.put("handle_class", ""); + task.put("finished_type", ""); + task.put("is_delete", "0"); + task.put("create_id", currentUserId); + task.put("create_name", nickName); + task.put("create_time", nowtime); + task.put("update_optid", currentUserId); + task.put("update_optname", nickName); + task.put("update_time", nowtime); + task.put("priority", "1"); + wo_Task.insert(task); + } + //更新分配表状态、任务号 + map.put("work_status", "01"); + map.put("task_id", task_id); + map.put("point_id", point.getString("point_id")); + map.put("point_code", point.getString("point_code")); + map.put("point_name", point.getString("point_name")); + wo_dis.update(map, "iostorinv_id='" + iostorinv_id + "' and storagevehicle_code='" + storagevehicle_code + "'"); + //锁定点位仓位 + JSONObject from_end = new JSONObject(); + from_end.put("point_code", point.getString("point_code")); + from_end.put("lock_type", "01"); + from_end.put("inv_type", jo_mst.getString("bill_type")); + from_end.put("inv_id", jo_mst.getString("iostorinv_id")); + from_end.put("inv_code", jo_mst.getString("bill_code")); + from_end.put("taskdtl_type", task.getString("taskdtl_type")); + from_end.put("taskdtl_id", task.getString("taskdtl_id")); + from_end.put("task_code", task.getString("task_code")); + storPublicService.updateStructAndPoint(from_end); + } + } + + @Override + public JSONArray getStructIvt(Map whereJson) { + HashMap map = new HashMap(whereJson); + if (StrUtil.isNotEmpty(map.get("remark"))) { + map.put("remark", "%" + map.get("remark") + "%"); + } + JSONArray jo = WQL.getWO("QST_IVT_CHECKOUTBILL") + .addParam("flag", "3") + .addParam("material_id", map.get("material_id")) + .addParam("quality_scode", map.get("quality_scode")) + .addParam("pcsn", map.get("pcsn")) + .addParam("ivt_level", map.get("ivt_level")) + .addParam("is_active", map.get("is_active")) + .addParam("iostorinv_id", map.get("iostorinv_id")) + .addParam("stor_id", map.get("stor_id")) + .addParam("sect_id", map.get("sect_id")) + .addParam("remark", map.get("remark")) + .process() + .getResultJSONArray(0); + return jo; + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void manualDiv(JSONObject form) { + //出库分配表 + WQLObject wo_dis = WQLObject.getWQLObject("ST_IVT_IOStorInvDis"); + //出库明细表 + WQLObject wo_dtl = WQLObject.getWQLObject("ST_IVT_IOStorInvDtl"); + //出库主表 + WQLObject wo_mst = WQLObject.getWQLObject("ST_IVT_IOStorInv"); + + //定义需要更新的仓位集合 + HashMap Struct_map = new HashMap<>(); + JSONObject whereJson = form.getJSONObject("row"); + JSONArray rows = form.getJSONArray("rows"); + String iostorinv_id = whereJson.getString("iostorinv_id"); + //查询主表信息 + JSONObject jo_mst = wo_mst.query("iostorinv_id = '" + iostorinv_id + "'").uniqueResult(0); + if (ObjectUtil.isEmpty(jo_mst)) { + throw new BadRequestException("当前订单无可分配出库明细"); + } + + //查询生成和未分配完的明细 + JSONArray dtls = WQL.getWO("QST_IVT_CHECKOUTBILL") + .addParam("flag", "2") + .addParam("bill_status", "30") + .addParam("unassign_flag", "1") + .addParam("iostorinv_id", iostorinv_id) + .addParam("iostorinvdtl_id", whereJson.getString("iostorinvdtl_id")) + .process() + .getResultJSONArray(0); + if (ObjectUtil.isEmpty(dtls)) { + throw new BadRequestException("当前订单无可分配出库明细"); + } + + for (int i = 0; i < dtls.size(); i++) { + JSONObject dtl = dtls.getJSONObject(i); + double unassign_qty = dtl.getDoubleValue("unassign_qty"); + double plan_qty = dtl.getDoubleValue("plan_qty"); + if (rows.size() != 0) { + for (int j = 0; j < rows.size(); j++) { + JSONObject ivt = rows.getJSONObject(j); + double canuse_qty = ivt.getDoubleValue("plan_qty"); + if (unassign_qty >= canuse_qty) { + unassign_qty = unassign_qty - canuse_qty; + ivt.put("change_qty", canuse_qty + ""); + } else { + ivt.put("change_qty", unassign_qty + ""); + unassign_qty = 0; + } + //更新库存 + ivt.put("bill_type_scode", jo_mst.getString("bill_type")); + ivt.put("inv_id", dtl.getString("iostorinv_id")); + ivt.put("bill_code", jo_mst.getString("bill_code")); + ivt.put("bill_table", "ST_IVT_IOStorInv"); + storPublicService.IOStor(ivt, "11"); + //生成分配明细 + dtl.put("iostorinvdis_id", IdUtil.getSnowflake(1, 1).nextId()); + dtl.put("sect_id", ivt.getString("sect_id")); + dtl.put("sect_code", ivt.getString("sect_code")); + dtl.put("sect_name", ivt.getString("sect_name")); + dtl.put("struct_id", ivt.getString("struct_id")); + dtl.put("struct_code", ivt.getString("struct_code")); + dtl.put("struct_name", ivt.getString("struct_name")); + dtl.put("pcsn", ivt.getString("pcsn")); + dtl.put("work_status", "00"); + dtl.put("storagevehicle_id", ivt.getString("storagevehicle_id")); + dtl.put("storagevehicle_code", ivt.getString("storagevehicle_code")); + dtl.put("storagevehicle_type", ivt.getString("storagevehicle_type")); + dtl.put("is_issued", "0"); + dtl.put("plan_qty", ivt.getDoubleValue("change_qty")); + dtl.put("real_qty", "0"); + wo_dis.insert(dtl); + //记录需锁定的仓位 + Struct_map.put(ivt.getString("struct_id"), ivt); + if (unassign_qty == 0) { + break; + } + } + HashMap map_dtl = new HashMap(); + //更新明细 + map_dtl.put("unassign_qty", unassign_qty + ""); + map_dtl.put("assign_qty", (plan_qty - unassign_qty) + ""); + if (unassign_qty == 0) { + map_dtl.put("bill_status", "40"); + } else { + map_dtl.put("bill_status", "30"); + } + wo_dtl.update(map_dtl, "iostorinvdtl_id='" + dtl.getString("iostorinvdtl_id") + "'"); + } else { + //对一条明细分配时，需要提示错误 + if (dtls.size() == 1) { + throw new BadRequestException("当前明细无可分配库存"); + } + } + + } + //更新主表状态 + this.updateMststatus(iostorinv_id); + //锁定点位、仓位 + Collection c = Struct_map.values(); + Iterator it = c.iterator(); + for (; it.hasNext(); ) { + JSONObject Struct = it.next(); + //锁定起点仓位点位 + JSONObject from_start = new JSONObject(); + from_start.put("struct_id", Struct.getString("struct_id")); + from_start.put("lock_type", "01"); + from_start.put("inv_type", jo_mst.getString("bill_type")); + from_start.put("inv_id", jo_mst.getString("iostorinv_id")); + from_start.put("inv_code", jo_mst.getString("bill_code")); + storPublicService.updateStructAndPoint(from_start); + } + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void confirm(JSONObject form) { + //出库分配表 + WQLObject wo_dis = WQLObject.getWQLObject("ST_IVT_IOStorInvDis"); + //出库明细表 + WQLObject wo_dtl = WQLObject.getWQLObject("ST_IVT_IOStorInvDtl"); + //出库主表 + WQLObject wo_mst = WQLObject.getWQLObject("ST_IVT_IOStorInv"); + + String iostorinv_id = form.getString("iostorinv_id"); + Long currentUserId = SecurityUtils.getCurrentUserId(); + String nickName = SecurityUtils.getCurrentNickName(); + + String now = DateUtil.now(); + //查询主表信息 + JSONObject jo_mst = wo_mst.query("iostorinv_id = '" + iostorinv_id + "'").uniqueResult(0); + if (ObjectUtil.isEmpty(jo_mst)) { + throw new BadRequestException("未查到相关出库单"); + } + //判断是否存在未确认状态的分配记录 + JSONObject task = wo_dis.query("work_status <>'99' and iostorinv_id = '" + iostorinv_id + "'").uniqueResult(0); + if (ObjectUtil.isNotEmpty(task)) { + JSONArray ja00 = wo_dis.query("work_status ='00' and iostorinv_id = '" + iostorinv_id + "'").getResultJSONArray(0); + JSONArray jatotal = wo_dis.query("iostorinv_id = '" + iostorinv_id + "'").getResultJSONArray(0); + if (ja00.size() == jatotal.size()) { + throw new BadRequestException("分配明细全是未生成状态，不需要强制确认，请删除单据！"); + } else { + throw new BadRequestException("存在未确认状态的出库分配记录，不允许强制确认！"); + } + } + //查询生成和未分配完的明细 + JSONArray dtls = WQL.getWO("QST_IVT_CHECKOUTBILL") + .addParam("flag", "2") + .addParam("bill_status", "50") + .addParam("iostorinv_id", iostorinv_id) + .process() + .getResultJSONArray(0); + if (dtls.size() != 0) { + for (int i = 0; i < dtls.size(); i++) { + JSONObject dtl = dtls.getJSONObject(i); + HashMap map_dtl = new HashMap<>(); + //更新明细状态 + map_dtl.put("bill_status", "99"); + wo_dtl.update(map_dtl, "iostorinvdtl_id='" + dtl.getString("iostorinvdtl_id") + "'"); + } + } + HashMap map_mst = new HashMap<>(); + map_mst.put("bill_status", "99"); + map_mst.put("confirm_optid", currentUserId + ""); + map_mst.put("confirm_optname", nickName); + map_mst.put("confirm_time", now); + //更新主表状态 + wo_mst.update(map_mst, "iostorinv_id = '" + iostorinv_id + "'"); + //查询需要更新库存的分配记录 + JSONArray diss = WQL.getWO("QST_IVT_CHECKOUTBILL") + .addParam("flag", "55") + .addParam("iostorinv_id", iostorinv_id) + .process() + .getResultJSONArray(0); + for (int i = 0; i < diss.size(); i++) { + JSONObject dis = diss.getJSONObject(i); + double plan_qty = dis.getDoubleValue("plan_qty"); + double real_qty = dis.getDoubleValue("real_qty"); + //全出判断是否全出 + if ("02".equals(dis.getString("taskdtl_type"))) { + if (plan_qty != real_qty) { + throw new BadRequestException(dis.getString("storagevehicle_code") + "全出载具未完成出库！"); + } + } + //未出部分，按取消分配处理 + if (real_qty != plan_qty) { + dis.put("change_qty", plan_qty - real_qty); + dis.put("bill_type_scode", jo_mst.getString("bill_type")); + dis.put("inv_id", iostorinv_id); + dis.put("bill_code", jo_mst.getString("bill_code")); + dis.put("bill_table", "ST_IVT_IOStorInv"); + storPublicService.IOStor(dis, "12"); + } + //更新已出库重量 + if (real_qty != 0) { + dis.put("change_qty", real_qty); + dis.put("bill_type_scode", jo_mst.getString("bill_type")); + dis.put("inv_id", iostorinv_id); + dis.put("bill_code", jo_mst.getString("bill_code")); + dis.put("bill_table", "ST_IVT_IOStorInv"); + storPublicService.IOStor(dis, "21"); + } + //解锁起点 + JSONObject from_start = new JSONObject(); + from_start.put("struct_id", dis.getString("struct_id")); + from_start.put("lock_type", "00"); + if ("02".equals(dis.getString("taskdtl_type"))) { + from_start.put("is_free", "1"); + } + storPublicService.updateStructAndPoint(from_start); + //解锁终点 + JSONObject from_end = new JSONObject(); + from_end.put("point_code", dis.getString("point_code")); + from_end.put("lock_type", "00"); + storPublicService.updateStructAndPoint(from_end); + } + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void issueTask(JSONObject whereJson) { + //出库分配表 + WQLObject wo_dis = WQLObject.getWQLObject("ST_IVT_IOStorInvDis"); + //任务表 + WQLObject wo_Task = WQLObject.getWQLObject("SCH_BASE_Task"); + + Long currentUserId = SecurityUtils.getCurrentUserId(); + String nickName = SecurityUtils.getCurrentNickName(); + String now = DateUtil.now(); + + TaskDto checkOutBillAcsTask = null; + String task_id = whereJson.getString("task_id"); + String taskdtl_id = whereJson.getString("taskdtl_id"); + JSONObject result = null; + if (ObjectUtil.isNotEmpty(result)) { + String status = result.getString("status"); + if ("200".equals(status)) { + HashMap map = new HashMap<>(); + //更新分配表 + map.put("is_issued", "1"); + wo_dis.update(map, "task_id='" + task_id + "'"); + //更新任务为已下发 + map.put("task_status", "02"); + map.put("update_optid", currentUserId + ""); + map.put("update_optname", nickName); + map.put("update_time", now); + wo_Task.update(map, "taskdtl_id='" + taskdtl_id + "'"); + } else { + throw new BadRequestException("任务下发失败，请稍后重试！"); + } + } else { + throw new BadRequestException("任务下发失败，请稍后重试！"); + } + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void finishTask(JSONObject whereJson) { + //出库分配表 + WQLObject wo_dis = WQLObject.getWQLObject("ST_IVT_IOStorInvDis"); + //出库明细表 + WQLObject wo_dtl = WQLObject.getWQLObject("st_ivt_iostorinvdtl"); + //任务表 + WQLObject wo_Task = WQLObject.getWQLObject("SCH_BASE_Task"); + String taskdtl_id = whereJson.getString("taskdtl_id"); + + Long currentUserId = SecurityUtils.getCurrentUserId(); + String nickName = SecurityUtils.getCurrentNickName(); + String now = DateUtil.now(); + + JSONObject task = wo_Task.query("task_status<>'99' and taskdtl_id='" + taskdtl_id + "'").uniqueResult(0); + + if (task == null) { + throw new BadRequestException("查询不到操作的任务记录！"); + } + + String taskdtl_type = task.getString("taskdtl_type"); + String task_id = task.getString("task_id"); + JSONObject dtljo = wo_dis.query("task_id='" + task_id + "'").uniqueResult(0); + whereJson.put("iostorinv_id", dtljo.getString("iostorinv_id")); + HashMap map = new HashMap<>(); + //更新任务为完成 + map.put("task_status", TaskStatusEnum.FINISHED.getCode()); + map.put("finished_type", "01"); + map.put("update_optid", currentUserId + ""); + map.put("update_optname", nickName); + map.put("update_time", now); + wo_Task.update(map, "taskdtl_id='" + taskdtl_id + "'"); + if ("05".equals(taskdtl_type)) {//拣选出库 + //更新分配表 + map.put("work_status", "02"); + wo_dis.update(map, "task_id='" + task_id + "'"); + } else if ("06".equals(taskdtl_type)) {//拣选回库 + map.put("work_status", "99"); + wo_dis.update(map, "task_id='" + task_id + "'"); + //判断是否还有未完成的明细 + JSONArray ja = wo_dtl.query("bill_status<>'99' and iostorinv_id='" + whereJson.getString("iostorinv_id") + "'").getResultJSONArray(0); + if (ja.size() == 0) { + this.confirm(whereJson); + } + } else {//全出 + map.put("work_status", "99"); + wo_dis.update(map, "task_id='" + task_id + "'"); + //判断是否还有未完成的明细 + JSONArray ja = wo_dtl.query("bill_status<>'99' and iostorinv_id='" + whereJson.getString("iostorinv_id") + "'").getResultJSONArray(0); + if (ja.size() == 0) { + this.confirm(whereJson); + } + } + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void cancleTaskfinish(JSONObject whereJson) { + //出库明细表 + WQLObject wo_dtl = WQLObject.getWQLObject("ST_IVT_IOStorInvDtl"); + //出库分配表 + WQLObject wo_dis = WQLObject.getWQLObject("ST_IVT_IOStorInvDis"); + //出库分配明细表 + WQLObject wo_DisDtl = WQLObject.getWQLObject("ST_IVT_IOStorInvDisDtl"); + //任务表 + WQLObject wo_Task = WQLObject.getWQLObject("SCH_BASE_Task"); + //出库主表 + WQLObject wo_mst = WQLObject.getWQLObject("ST_IVT_IOStorInv"); + //桶物料变动记录表 + WQLObject wo_BucketChangeFlow = WQLObject.getWQLObject("MD_PB_BucketChangeFlow"); + //桶记录表 + WQLObject wo_BucketRecord = WQLObject.getWQLObject("MD_PB_BucketRecord"); + + String iostorinv_id = whereJson.getString("iostorinv_id"); + String taskdtl_id = whereJson.getString("taskdtl_id"); + HashMap map = new HashMap(); + Long currentUserId = SecurityUtils.getCurrentUserId(); + String nickName = SecurityUtils.getCurrentNickName(); + + String now = DateUtil.now(); + //查询主表信息 + JSONObject jo_mst = wo_mst.query("iostorinv_id = '" + iostorinv_id + "'").uniqueResult(0); + if (ObjectUtil.isEmpty(jo_mst)) { + throw new BadRequestException("未查到相关出库单"); + } + if (jo_mst.getString("bill_status").equals("99")) { + throw new BadRequestException("已审核单据不允许取消完成！"); + } + JSONObject task = wo_Task.query("taskdtl_id='" + taskdtl_id + "'").uniqueResult(0); + String taskdtl_type = task.getString("taskdtl_type"); + String task_id = task.getString("task_id"); + if ("05".contains(taskdtl_type)) { + //查询拣选出库对应的拣选回库有没有先取消完成 + JSONObject task06 = wo_Task.query("task_status='99' and taskdtl_type='06' and task_id='" + task_id + "'").uniqueResult(0); + if (task06 != null) { + throw new BadRequestException("请先取消拣选出库对应的拣选回库指令！"); + } + } + //如果为拣选出库05 + if ("05,02".contains(taskdtl_type)) { + //更新任务为已下发 + map.put("task_status", "01"); + map.put("finished_type", ""); + map.put("update_optid", currentUserId + ""); + map.put("update_optname", nickName); + map.put("update_time", now); + wo_Task.update(map, "taskdtl_type='" + taskdtl_type + "' and task_id='" + task_id + "'"); + //查询生成和未分配完的明细 + JSONArray disdtls = WQL.getWO("QST_IVT_CHECKOUTBILL") + .addParam("flag", "8") + .addParam("task_id", task_id) + .process() + .getResultJSONArray(0); + if (disdtls.size() != 0) { + for (int i = 0; i < disdtls.size(); i++) { + JSONObject disdtl = disdtls.getJSONObject(i); + //更新桶记录相关表 + double real_qty_disDtl = disdtl.getDoubleValue("real_qty"); + String bucketunique = disdtl.getString("bucketunique"); + //查询桶记录 + JSONObject bucket = wo_BucketRecord.query("status='04' and bucketunique='" + bucketunique + "'").uniqueResult(0); + double storage_qty = bucket.getDoubleValue("storage_qty"); + //重量加回去 + storage_qty = storage_qty + real_qty_disDtl; + bucket.put("storage_qty", storage_qty); + bucket.put("outstor_optid", currentUserId); + bucket.put("outstor_optname", nickName); + bucket.put("outstor_time", now); + //更新桶记录表 + wo_BucketRecord.update(bucket); + //插入一条变动记录 + bucket.put("change_id", IdUtil.getSnowflake(1, 1).nextId() + ""); + bucket.put("bucket_code", bucketunique); + bucket.put("change_type_scode", "01"); + bucket.put("change_time", now); + bucket.put("rec_person", currentUserId); + bucket.put("change_qty", real_qty_disDtl); + bucket.put("result_qty", storage_qty); + wo_BucketChangeFlow.insert(bucket); + //清空分配明细表 + wo_DisDtl.delete("iostorinvdisdtl_id='" + disdtl.getString("iostorinvdisdtl_id") + "'"); + //倒推明细表、分配表实际数量 + JSONObject dis = wo_dis.query("iostorinvdis_id='" + disdtl.getString("iostorinvdis_id") + "'").uniqueResult(0); + dis.put("real_qty", dis.getDoubleValue("real_qty") - real_qty_disDtl); + dis.put("work_status", "01"); + dis.put("is_issued", "0"); + wo_dis.update(dis); + + JSONObject dtl = wo_dtl.query("iostorinvdtl_id='" + disdtl.getString("iostorinvdtl_id") + "'").uniqueResult(0); + double real_qty = dtl.getDoubleValue("real_qty") - real_qty_disDtl; + if (real_qty == 0) { + dtl.put("bill_status", "40"); + } + wo_dtl.update(dtl); + } + } else { + map.put("work_status", "01"); + map.put("is_issued", "0"); + wo_dis.update(map, "task_id='" + task_id + "'"); + } + //更新主表状态 + this.updateMststatus(whereJson.getString("iostorinv_id")); + } else if ("06".equals(taskdtl_type)) {//如果为拣选回库 + //更新任务为已下发 + map.put("task_status", "01"); + map.put("finished_type", ""); + map.put("update_optid", currentUserId + ""); + map.put("update_optname", nickName); + map.put("update_time", now); + wo_Task.update(map, "taskdtl_type='06' and task_id='" + task_id + "'"); + } + } + + @Override + public JSONArray getInvTypes() { + //查询单据字段类型 + JSONArray ja = WQL.getWO("ST_PUB_QUERY_01") + .addParam("flag", "4") + .process() + .getResultJSONArray(0); + return ja; + } + + @Override + public JSONObject getParamByCodeType(JSONObject form) { + String bill_type = form.getString("bill_type"); + if (StrUtil.isEmpty(bill_type)) { + throw new BadRequestException("出库单类型不能为空！"); + } + Map whereJson = new HashMap(); + String io_flag = form.getString("io_flag"); + whereJson.put("io_code", bill_type.substring(0, 4)); + whereJson.put("io_flag", "01"); + if (StrUtil.isNotEmpty(bill_type)) { + whereJson.put("io_flag", io_flag); + } + JSONArray ja = null; + JSONObject ret = new JSONObject(); + if (ja.size() != 0) { + for (int i = 0; i < ja.size(); i++) { + JSONObject jo = ja.getJSONObject(i); + if (bill_type.equals(jo.getString("code"))) { + ret = jo; + break; + } + } + } else { + throw new BadRequestException("出库类型系统参数查询失败！"); + } + return ret; + } + + @Override + public JSONArray schAreaType(JSONObject form) { + String ids = form.getString("ids"); + //查询单据字段类型 + JSONArray ja = WQL.getWO("ST_PUB_QUERY_01") + .addParam("flag", "5") + .addParam("ids", ids) + .process() + .getResultJSONArray(0); + return ja; + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void backConfirm(JSONObject whereJson) { + WQLObject dtl_wql = WQLObject.getWQLObject("st_ivt_iostorinvdtl"); + WQLObject mst_wql = WQLObject.getWQLObject("ST_IVT_IOStorInv"); + + JSONObject mst_row = mst_wql.query("iostorinv_id = '" + whereJson.get("iostorinv_id") + "'").uniqueResult(0); + //校验主表状态为生成 + String bill_status = mst_row.getString("bill_status"); + if (!bill_status.equals("10")) { + throw new BadRequestException("主表状态必须为生成状态！"); + } + JSONArray dtl_rows = dtl_wql.query("iostorinv_id = '" + whereJson.get("iostorinv_id") + "'").getResultJSONArray(0); + + //生成手工入库库单 + String iostorinv_id = IdUtil.getSnowflake(1, 1).nextId() + ""; + String bill_code = CodeUtil.getNewCode("IO_CODE"); + + for (int i = 0; i < dtl_rows.size(); i++) { + JSONObject dtl_row = dtl_rows.getJSONObject(i); + dtl_row.put("source_billdtl_id", dtl_row.getString("iostorinvdtl_id")); + dtl_row.put("source_bill_type", mst_row.getString("bill_type")); + dtl_row.put("source_bill_code", mst_row.getString("bill_code")); + dtl_row.put("source_bill_table", "ST_IVT_IOStorInvDtl"); + dtl_row.put("iostorinvdtl_id", IdUtil.getSnowflake(1, 1).nextId()); + dtl_row.put("iostorinv_id", iostorinv_id); + dtl_wql.insert(dtl_row); + } + + mst_row.put("iostorinv_id", iostorinv_id); + mst_row.put("bill_code", bill_code); + mst_row.put("io_type", "0"); + mst_row.put("bill_type", "000401"); + mst_row.put("buss_type", ((String) mst_row.get("bill_type")).substring(0, 4)); + mst_wql.insert(mst_row); + + Long currentUserId = SecurityUtils.getCurrentUserId(); + String nickName = SecurityUtils.getCurrentNickName(); + String now = DateUtil.now(); + JSONObject mst_row2 = mst_wql.query("iostorinv_id = '" + whereJson.get("iostorinv_id") + "'").uniqueResult(0); + + mst_row2.put("bill_status", "99"); + mst_row2.put("confirm_optid", currentUserId); + mst_row2.put("confirm_optname", nickName); + mst_row2.put("confirm_time", now); + //更新主表状态为99 + mst_wql.update(mst_row2); + + HashMap map = new HashMap<>(); + map.put("bill_status", "99"); + dtl_wql.update(map, "iostorinv_id = '" + whereJson.get("iostorinv_id") + "'"); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public JSONArray getType() { + JSONArray jsonArr = WQL.getWO("QST_IVT_CHECKOUTBILL").addParam("flag", "11").process().getResultJSONArray(0); + return jsonArr; + } + + /** + * 更新主表状态 + * + * @param iostorinv_id + */ + void updateMststatus(String iostorinv_id) { + //出库主表 + WQLObject wo_mst = WQLObject.getWQLObject("ST_IVT_IOStorInv"); + //出库明细表 + WQLObject wo_dtl = WQLObject.getWQLObject("ST_IVT_IOStorInvDtl"); + + Long currentUserId = SecurityUtils.getCurrentUserId(); + String nickName = SecurityUtils.getCurrentNickName(); + String now = DateUtil.now(); + //查询主表信息 + JSONObject jo_mst = wo_mst.query("iostorinv_id = '" + iostorinv_id + "'").uniqueResult(0); + jo_mst.put("update_optid", currentUserId + ""); + jo_mst.put("update_optname", nickName); + jo_mst.put("update_time", now); + //更新主表状态 + JSONArray dtls_40 = wo_dtl.query("bill_status='40' and iostorinv_id = '" + iostorinv_id + "'").getResultJSONArray(0); + //已分配完明细数小于总明细数 + if (dtls_40.size() < jo_mst.getInteger("detail_count")) { + JSONArray dtls_30 = wo_dtl.query("bill_status='30' and iostorinv_id = '" + iostorinv_id + "'").getResultJSONArray(0); + //存在分配完的明细 + if (dtls_40.size() != 0) {//分配中明细数不为0 + jo_mst.put("bill_status", "30"); + } else if (dtls_40.size() == 0) { + //不存在分配中和分配完的明细 + if (dtls_30.size() == 0) { + jo_mst.put("bill_status", "10"); + }//存在分配中的明细 + else if (dtls_30.size() != 0) { + jo_mst.put("bill_status", "30"); + } + } + } else {//已分配完明细数等于总明细数 + jo_mst.put("bill_status", "40"); + } + wo_mst.update(jo_mst); + } + + /** + * 判断仓位上可用数是否为0，0返回true，非0返回false + * + * @param code 载具编码或者仓位编码 + */ + boolean canuse_is_zero(String code) { + //仓位库存表 + WQLObject wo_StructIvt = WQLObject.getWQLObject("ST_IVT_StructIvt"); + //仓位表 + WQLObject wo_Struct = WQLObject.getWQLObject("ST_IVT_StructAttr"); + if (StrUtil.isEmpty(code)) { + throw new BadRequestException("仓位编码不能为空！"); + } + //查询仓位信息 + JSONObject jo_mst = wo_Struct.query("struct_code = '" + code + "'").uniqueResult(0); + if (jo_mst != null) { + //查询可用数大于0的记录数 + JSONArray ja = wo_StructIvt.query("canuse_qty>0 and struct_code = '" + code + "'").getResultJSONArray(0); + if (ja.size() != 0) { + return false; + } + } else { + throw new BadRequestException("查询不到相关仓位！"); + } + return true; + } +} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/wql/QST_IVT_CHECKOUTBILL.wql b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/wql/QST_IVT_CHECKOUTBILL.wql new file mode 100644 index 000000000..cd09a6af1 --- /dev/null +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/wql/QST_IVT_CHECKOUTBILL.wql @@ -0,0 +1,681 @@ +[交易说明] + 交易名： 基础点位分页查询 + 所属模块： + 功能简述： + 版权所有： + 表引用： + 版本经历： + +[数据库] + --指定数据库，为空采用默认值，默认为db.properties中列出的第一个库 + +[IO定义] + ################################################# + ## 表字段对应输入参数 + ################################################# + 输入.flag TYPEAS s_string + 输入.bill_status TYPEAS s_string + 输入.bill_code TYPEAS s_string + 输入.source_bill_code TYPEAS f_string + 输入.username TYPEAS s_string + 输入.create_mode TYPEAS s_string + 输入.bill_type TYPEAS s_string + 输入.stor_id TYPEAS s_string + 输入.iostorinv_id TYPEAS s_string + 输入.buss_type TYPEAS s_string + 输入.end_time TYPEAS s_string + 输入.begin_time TYPEAS s_string + 输入.material_id TYPEAS s_string + 输入.material_code TYPEAS s_string + 输入.quality_scode TYPEAS s_string + 输入.pcsn TYPEAS s_string + 输入.ivt_level TYPEAS s_string + 输入.is_active TYPEAS s_string + 输入.sect_id TYPEAS s_string + 输入.io_type TYPEAS s_string + 输入.iostorinvdtl_id TYPEAS s_string + 输入.unassign_flag TYPEAS s_string + 输入.struct_id TYPEAS s_string + 输入.iostorinvdis_id TYPEAS s_string + 输入.is_issued TYPEAS s_string + 输入.remark TYPEAS s_string + 输入.task_id TYPEAS s_string + 输入.task_status TYPEAS s_string + 输入.deptIds TYPEAS f_string +[临时表] + --这边列出来的临时表就会在运行期动态创建 + +[临时变量] + --所有中间过程变量均可在此处定义 + +[业务过程] + + ########################################## + # 1、输入输出检查 # + ########################################## + + + ########################################## + # 2、主过程前处理 # + ########################################## + + + ########################################## + # 3、业务主过程 # + ########################################## + + IF 输入.flag = "1" + PAGEQUERY + SELECT + ios.iostorinv_id AS id, + ios.*, + user.nick_name AS upload_optname + FROM + ST_IVT_IOStorInv ios + inner join (SELECT + invdtl.iostorinv_id + FROM + st_ivt_iostorinvdtl invdtl + LEFT JOIN md_me_materialbase mb ON mb.material_id = invdtl.material_id + where 1=1 + OPTION 输入.quality_scode <> "" + invdtl.quality_scode = 输入.quality_scode + ENDOPTION + OPTION 输入.pcsn <> "" + invdtl.pcsn like 输入.pcsn + ENDOPTION + OPTION 输入.material_code <> "" + (mb.material_code like 输入.material_code or mb.material_name like 输入.material_code) + ENDOPTION + group by iostorinv_id) dtlcopy on dtlcopy.iostorinv_id = ios.iostorinv_id + LEFT JOIN sys_user user ON user.user_id = ios.upload_optid + WHERE 1=1 + and ios.is_delete='0' + OPTION 输入.bill_code <> "" + ios.bill_code like 输入.bill_code + ENDOPTION + OPTION 输入.io_type <> "" + ios.io_type = 输入.io_type + ENDOPTION + OPTION 输入.buss_type <> "" + ios.buss_type like 输入.buss_type + ENDOPTION + OPTION 输入.bill_type <> "" + ios.bill_type = 输入.bill_type + ENDOPTION + OPTION 输入.stor_id <> "" + ios.stor_id = 输入.stor_id + ENDOPTION + OPTION 输入.deptIds <> "" + ios.sysdeptid in 输入.deptIds + ENDOPTION + OPTION 输入.create_mode <> "" + ios.create_mode = 输入.create_mode + ENDOPTION + OPTION 输入.bill_status <> "" + ios.bill_status = 输入.bill_status + ENDOPTION + OPTION 输入.begin_time <> "" + ios.input_time >= 输入.begin_time + ENDOPTION + OPTION 输入.end_time <> "" + ios.input_time <= 输入.end_time + ENDOPTION + ENDSELECT + ENDPAGEQUERY + ENDIF + + IF 输入.flag = "2" + QUERY + SELECT + iosdtl.*, + ios.bill_code, + mb.material_code, + mb.material_name + FROM + ST_IVT_IOStorInvDtl iosdtl + LEFT JOIN md_me_materialbase mb ON mb.material_id = iosdtl.material_id + LEFT JOIN ST_IVT_IOStorInv ios ON ios.iostorinv_id = iosdtl.iostorinv_id + WHERE + 1=1 + OPTION 输入.iostorinv_id <> "" + iosdtl.iostorinv_id = 输入.iostorinv_id + ENDOPTION + OPTION 输入.iostorinvdtl_id <> "" + iosdtl.iostorinvdtl_id = 输入.iostorinvdtl_id + ENDOPTION + OPTION 输入.bill_status <> "" + iosdtl.bill_status <= 输入.bill_status + ENDOPTION + OPTION 输入.unassign_flag <> "" + iosdtl.unassign_qty >0 + ENDOPTION + order by iosdtl.seq_no + ENDSELECT + ENDQUERY + ENDIF + + IF 输入.flag = "3" + QUERY + SELECT * FROM ( + SELECT + ivt.*, + '0' AS plan_qty, + mb.material_code, + mb.material_name, + struct.sect_id, + struct.sect_name, + struct.sect_code, + struct.storagevehicle_id, + struct.storagevehicle_code, + struct.storagevehicle_type, + point.point_id + FROM + ST_IVT_StructIvt ivt + LEFT JOIN st_ivt_structattr struct ON struct.struct_id = ivt.struct_id + LEFT JOIN md_me_materialbase mb ON mb.material_id = ivt.material_id + LEFT JOIN SCH_BASE_Point point ON struct.struct_id = point.source_id + WHERE + 1 = 1 and struct.lock_type='01' + and struct.struct_id in ( + SELECT + dis.struct_id + FROM + ST_IVT_IOStorInvDis dis + WHERE 1=1 + and dis.work_status = '00' + OPTION 输入.iostorinv_id <> "" + dis.iostorinv_id = 输入.iostorinv_id + ENDOPTION + ) + OPTION 输入.material_id <> "" + ivt.material_id = 输入.material_id + ENDOPTION + OPTION 输入.quality_scode <> "" + ivt.quality_scode = 输入.quality_scode + ENDOPTION + OPTION 输入.pcsn <> "" + ivt.pcsn = 输入.pcsn + ENDOPTION + OPTION 输入.remark <> "" + (mb.material_code like 输入.remark or mb.material_name like 输入.remark or struct.storagevehicle_code like 输入.remark) + ENDOPTION + OPTION 输入.ivt_level <> "" + ivt.ivt_level = 输入.ivt_level + ENDOPTION + OPTION 输入.is_active <> "" + ivt.is_active = 输入.is_active + ENDOPTION + OPTION 输入.stor_id <> "" + ivt.stor_id = 输入.stor_id + ENDOPTION + OPTION 输入.sect_id <> "" + struct.sect_id = 输入.sect_id + ENDOPTION + order by ivt.canuse_qty,ivt.pcsn desc + ) t1 + UNION + SELECT * FROM ( + SELECT + ivt2.*, + '0' AS plan_qty, + mb.material_code, + mb.material_name, + struct.sect_id, + struct.sect_name, + struct.sect_code, + struct.storagevehicle_id, + struct.storagevehicle_code, + struct.storagevehicle_type, + point.point_id + FROM + ST_IVT_StructIvt ivt2 + LEFT JOIN st_ivt_structattr struct ON struct.struct_id = ivt2.struct_id + LEFT JOIN md_me_materialbase mb ON mb.material_id = ivt2.material_id + LEFT JOIN SCH_BASE_Point point ON struct.struct_id = point.source_id + WHERE + 1 = 1 and struct.lock_type='00' + OPTION 输入.material_id <> "" + ivt2.material_id = 输入.material_id + ENDOPTION + OPTION 输入.quality_scode <> "" + ivt2.quality_scode = 输入.quality_scode + ENDOPTION + OPTION 输入.pcsn <> "" + ivt2.pcsn = 输入.pcsn + ENDOPTION + OPTION 输入.remark <> "" + (mb.material_code like 输入.remark or mb.material_name like 输入.remark or struct.storagevehicle_code like 输入.remark) + ENDOPTION + OPTION 输入.ivt_level <> "" + ivt2.ivt_level = 输入.ivt_level + ENDOPTION + OPTION 输入.is_active <> "" + ivt2.is_active = 输入.is_active + ENDOPTION + OPTION 输入.stor_id <> "" + ivt2.stor_id = 输入.stor_id + ENDOPTION + OPTION 输入.sect_id <> "" + struct.sect_id = 输入.sect_id + ENDOPTION + order by ivt2.canuse_qty,ivt2.pcsn desc + ) t2 + ENDSELECT + ENDQUERY + ENDIF + + IF 输入.flag = "4" + QUERY + SELECT + dis.iostorinvdis_id + FROM + ST_IVT_IOStorInvDis dis + WHERE + 1 = 1 + AND dis.work_status IN ('02', '99') + OPTION 输入.iostorinvdtl_id <> "" + dis.iostorinvdtl_id = 输入.iostorinvdtl_id + ENDOPTION + UNION + SELECT + dis.iostorinvdis_id + FROM + ST_IVT_IOStorInvDis dis + LEFT JOIN SCH_BASE_Task task ON dis.task_id = task.task_id + AND task.is_delete = '0' + WHERE + 1 = 1 + AND dis.work_status = '01' + AND task.task_status IN ('02', '03', '99') + OPTION 输入.iostorinvdtl_id <> "" + dis.iostorinvdtl_id = 输入.iostorinvdtl_id + ENDOPTION + ENDSELECT + ENDQUERY + ENDIF + + IF 输入.flag = "5" + QUERY + SELECT + dis.*, + ios.io_type, + ios.bill_code, + mb.material_code, + mb.material_name, + task.task_code, + task.task_status, + task.taskdtl_type, + point.point_code AS start_point_code, + point2.area_type, + point2.source_id + FROM + ST_IVT_IOStorInvDis dis + LEFT JOIN ST_IVT_IOStorInv ios ON ios.iostorinv_id = dis.iostorinv_id + LEFT JOIN md_me_materialbase mb ON mb.material_id = dis.material_id + LEFT JOIN SCH_BASE_Task task ON task.task_id = dis.task_id AND task.is_delete = '0' and task.vehicle_code = dis.storagevehicle_code + LEFT JOIN SCH_BASE_Point point ON point.source_id = dis.struct_id + LEFT JOIN SCH_BASE_Point point2 ON point2.point_id = dis.point_id + WHERE + 1 = 1 + OPTION 输入.iostorinvdtl_id <> "" + dis.iostorinvdtl_id = 输入.iostorinvdtl_id + ENDOPTION + OPTION 输入.task_id <> "" + dis.task_id = 输入.task_id + ENDOPTION + OPTION 输入.iostorinv_id <> "" + dis.iostorinv_id = 输入.iostorinv_id + ENDOPTION + OPTION 输入.iostorinvdis_id <> "" + dis.iostorinvdis_id = 输入.iostorinvdis_id + ENDOPTION + OPTION 输入.is_issued <> "" + dis.is_issued = 输入.is_issued + ENDOPTION + OPTION 输入.struct_id <> "" + dis.struct_id = 输入.struct_id + ENDOPTION + OPTION 输入.bill_status <> "" + dis.work_status <= 输入.bill_status + ENDOPTION + ENDSELECT + ENDQUERY + ENDIF + + IF 输入.flag = "55" + QUERY + SELECT + dis.*, + mb.material_code, + mb.material_name, + task.task_code, + task.task_status, + task.taskdtl_type, + point.point_code AS start_point_code, + point2.area_type, + point2.source_id + FROM + ST_IVT_IOStorInvDis dis + LEFT JOIN md_me_materialbase mb ON mb.material_id = dis.material_id + LEFT JOIN SCH_BASE_Task task ON task.task_id = dis.task_id AND task.is_delete = '0' and task.vehicle_code = dis.storagevehicle_code + LEFT JOIN SCH_BASE_Point point ON point.source_id = dis.struct_id + LEFT JOIN SCH_BASE_Point point2 ON point2.point_id = dis.point_id + WHERE + 1 = 1 and task.taskdtl_type in('05','02') + OPTION 输入.iostorinvdtl_id <> "" + dis.iostorinvdtl_id = 输入.iostorinvdtl_id + ENDOPTION + OPTION 输入.task_id <> "" + dis.task_id = 输入.task_id + ENDOPTION + OPTION 输入.iostorinv_id <> "" + dis.iostorinv_id = 输入.iostorinv_id + ENDOPTION + OPTION 输入.iostorinvdis_id <> "" + dis.iostorinvdis_id = 输入.iostorinvdis_id + ENDOPTION + OPTION 输入.is_issued <> "" + dis.is_issued = 输入.is_issued + ENDOPTION + OPTION 输入.struct_id <> "" + dis.struct_id = 输入.struct_id + ENDOPTION + OPTION 输入.bill_status <> "" + dis.work_status <= 输入.bill_status + ENDOPTION + ENDSELECT + ENDQUERY + ENDIF + + IF 输入.flag = "6" + QUERY + SELECT + dis.iostorinv_id, + dis.is_issued, + dis.pcsn, + dis.storagevehicle_code, + mb.material_code, + mb.material_name, + task.taskdtl_id, + task.task_id, + task.task_code, + task.task_status, + task.taskdtl_type, + task.start_point_code, + task.next_point_code, + point2.area_type, + point2.source_id, + bucket.bucket_num, + bucket.total_storage_qty + FROM + ST_IVT_IOStorInvDis dis + LEFT JOIN md_me_materialbase mb ON mb.material_id = dis.material_id + LEFT JOIN SCH_BASE_Task task ON task.task_id = dis.task_id AND task.is_delete = '0' and task.vehicle_code = dis.storagevehicle_code + LEFT JOIN SCH_BASE_Point point2 ON point2.point_id = dis.point_id + LEFT JOIN ( + SELECT + sum(storage_qty) AS total_storage_qty, + COUNT(*) AS bucket_num, + br.storagevehicle_code + FROM + MD_PB_BucketRecord br + WHERE 1=1 + GROUP BY + br.storagevehicle_code + ) bucket ON bucket.storagevehicle_code = dis.storagevehicle_code + WHERE + 1 = 1 + OPTION 输入.iostorinvdtl_id <> "" + dis.iostorinvdtl_id = 输入.iostorinvdtl_id + ENDOPTION + OPTION 输入.iostorinv_id <> "" + dis.iostorinv_id = 输入.iostorinv_id + ENDOPTION + OPTION 输入.is_issued <> "" + dis.is_issued = 输入.is_issued + ENDOPTION + OPTION 输入.struct_id <> "" + dis.struct_id = 输入.struct_id + ENDOPTION + OPTION 输入.task_status <> "" + task.task_status <> 输入.task_status + ENDOPTION + ENDSELECT + ENDQUERY + ENDIF + + IF 输入.flag = "7" + PAGEQUERY + SELECT + qldtl.inspectiondtl_id AS source_billdtl_id, + qlmst.inspection_type AS source_bill_type, + qlmst.inspection_code AS source_bill_code, + 'QL_TEST_InspectionSheetMst' AS source_bill_table, + qldtl.base_bill_code, + qldtl.base_bill_id, + qldtl.base_bill_table, + qldtl.base_bill_type, + qlmst.biz_date, + mb.material_code, + mb.material_name, + qldtl.pcsn, + '2' AS plan_qty, + qldtl.material_id, + qldtl.qty_unit_id, + qldtl.qty_unit_name + FROM + ql_test_inspectionsheetdtl qldtl + LEFT JOIN ql_test_inspectionsheetmst qlmst ON qlmst.inspection_id = qldtl.inspection_id + LEFT JOIN md_me_materialbase mb ON mb.material_id = qldtl.material_id + WHERE + qlmst.is_delete = '0' + AND qldtl.bill_status IN ('10', '20', '30', '40', '50') + AND qlmst.inspection_type IN ('10', '20') + OPTION 输入.remark <> "" + (mb.material_code like 输入.remark or mb.material_name like 输入.remark) + ENDOPTION + OPTION 输入.bill_code <> "" + qlmst.inspection_code like 输入.bill_code + ENDOPTION + OPTION 输入.begin_time <> "" + qlmst.biz_date >= 输入.begin_time + ENDOPTION + OPTION 输入.end_time <> "" + qlmst.biz_date <= 输入.end_time + ENDOPTION + ENDSELECT + ENDPAGEQUERY + ENDIF + + IF 输入.flag = "8" + QUERY + SELECT + disdtl.* + FROM + ST_IVT_IOStorInvDisDtl disdtl + LEFT JOIN ST_IVT_IOStorInvDis dis ON dis.iostorinvdis_id = disdtl.iostorinvdis_id + WHERE + 1 = 1 + OPTION 输入.task_id <> "" + dis.task_id = 输入.task_id + ENDOPTION + ENDSELECT + ENDQUERY + ENDIF + + IF 输入.flag = "9" + QUERY + SELECT + disdtl.*, + mb.material_code, + mb.material_name, + task.task_code, + task.task_status, + task.taskdtl_type, + dis.point_code, + point.point_code AS start_point_code, + point2.area_type, + point2.source_id + FROM + ST_IVT_IOStorInvDisDtl disdtl + inner JOIN ST_IVT_IOStorInvDis dis ON disdtl.iostorinvdtl_id = dis.iostorinvdtl_id + LEFT JOIN md_me_materialbase mb ON mb.material_id = dis.material_id + LEFT JOIN SCH_BASE_Task task ON task.task_id = dis.task_id AND task.is_delete = '0' and task.vehicle_code = dis.storagevehicle_code + LEFT JOIN SCH_BASE_Point point ON point.source_id = dis.struct_id + LEFT JOIN SCH_BASE_Point point2 ON point2.point_id = dis.point_id + WHERE + 1 = 1 + OPTION 输入.iostorinvdtl_id <> "" + dis.iostorinvdtl_id = 输入.iostorinvdtl_id + ENDOPTION + ENDSELECT + ENDQUERY + ENDIF + + IF 输入.flag = "10" + QUERY + SELECT + dis.*, + disdtl.real_qty AS total_storage_qty, + disdtl.bucket_num, + mater.material_code, + mater.material_name, + task.start_point_code, + task.next_point_code, + task.taskdtl_id, + task.task_id, + task.task_code, + task.taskdtl_type, + task.task_status + FROM + st_ivt_iostorinvdis dis + LEFT JOIN md_me_materialbase mater ON dis.material_id = mater.material_id + LEFT JOIN sch_base_task task ON dis.task_id = task.task_id and task.vehicle_code = dis.storagevehicle_code AND task.is_delete = '0' + LEFT JOIN ( + SELECT + sum( real_qty ) AS real_qty, + count(iostorinvdtl_id) AS bucket_num, + iostorinvdtl_id, + storagevehicle_id + FROM + st_ivt_iostorinvdisdtl + GROUP BY + storagevehicle_id,iostorinvdtl_id + ) AS disdtl ON dis.iostorinvdtl_id = disdtl.iostorinvdtl_id + AND dis.storagevehicle_id = disdtl.storagevehicle_id + WHERE + 1=1 + OPTION 输入.iostorinvdtl_id <> "" + dis.iostorinvdtl_id = 输入.iostorinvdtl_id + ENDOPTION + OPTION 输入.iostorinv_id <> "" + dis.iostorinv_id = 输入.iostorinv_id + ENDOPTION + OPTION 输入.is_issued <> "" + dis.is_issued = 输入.is_issued + ENDOPTION + OPTION 输入.struct_id <> "" + dis.struct_id = 输入.struct_id + ENDOPTION + OPTION 输入.task_status <> "" + task.task_status <> 输入.task_status + ENDOPTION + ENDSELECT + ENDQUERY + ENDIF + + IF 输入.flag = "11" + QUERY + SELECT + detail.value AS code, + detail.label AS name + FROM + sys_dict_detail detail + INNER JOIN sys_dict dict ON detail.dict_id = dict.dict_id + WHERE + dict.name = 'ST_INV_TYPE_IO' + AND detail.name = 'IO_BUSS_TYPE' + ENDSELECT + ENDQUERY + ENDIF + + IF 输入.flag = "12" + PAGEQUERY + SELECT + SUM( iosdtl2.real_qty ) AS sum_real_qty, + SUM( iosdtl2.plan_qty ) AS sum_plan_qty, + iosdtl2.qty_unit_id, + iosdtl2.qty_unit_name, + iosdtl2.material_name, + iosdtl2.material_code, + iosdtl2.material_id, + iosdtl2.pcsn, + iosdtl2.is_active, + iosdtl2.ivt_level, + iosdtl2.quality_scode + FROM + ( + SELECT + iosdtl.material_id, + iosdtl.pcsn, + iosdtl.quality_scode, + iosdtl.ivt_level, + iosdtl.is_active, + iosdtl.plan_qty, + iosdtl.real_qty, + iosdtl.qty_unit_id, + iosdtl.qty_unit_name, + mb.material_name, + mb.material_code + FROM + ST_IVT_IOStorInvDtl iosdtl + LEFT JOIN md_me_materialbase mb ON mb.material_id = iosdtl.material_id + LEFT JOIN ST_IVT_IOStorInv ios ON ios.iostorinv_id = iosdtl.iostorinv_id + LEFT JOIN sys_user user ON ios.input_optid = user.user_id + WHERE + 1 = 1 + AND ios.is_delete = '0' + AND ios.bill_type in ('010301','010302') + OPTION 输入.material_code <> "" + (mb.material_code like 输入.material_code or mb.material_name like 输入.material_code) + ENDOPTION + OPTION 输入.username <> "" + (user.username like 输入.username or ios.input_optname like 输入.username) + ENDOPTION + OPTION 输入.pcsn <> "" + iosdtl.pcsn like 输入.pcsn + ENDOPTION + OPTION 输入.source_bill_code <> "" + iosdtl.source_bill_code in 输入.source_bill_code + ENDOPTION + OPTION 输入.begin_time <> "" + ios.biz_date >= 输入.begin_time + ENDOPTION + OPTION 输入.end_time <> "" + ios.biz_date <= 输入.end_time + ENDOPTION + OPTION 输入.bill_type <> "" + ios.bill_type = 输入.bill_type + ENDOPTION + OPTION 输入.stor_id <> "" + ios.stor_id = 输入.stor_id + ENDOPTION + ) iosdtl2 + where 1=1 + GROUP BY + iosdtl2.material_id, + iosdtl2.pcsn, + iosdtl2.is_active, + iosdtl2.ivt_level, + iosdtl2.quality_scode, + iosdtl2.material_name, + iosdtl2.material_code, + iosdtl2.qty_unit_id, + iosdtl2.qty_unit_name + ENDSELECT + ENDPAGEQUERY + ENDIF + + + diff --git a/lms/nladmin-system/src/main/resources/logback-spring.xml b/lms/nladmin-system/src/main/resources/logback-spring.xml index f8547a761..be0616438 100644 --- a/lms/nladmin-system/src/main/resources/logback-spring.xml +++ b/lms/nladmin-system/src/main/resources/logback-spring.xml @@ -88,7 +88,7 @@ https://juejin.cn/post/6844903775631572999 - + @@ -97,7 +97,7 @@ https://juejin.cn/post/6844903775631572999 - + diff --git a/lms/nladmin-ui/src/views/wms/basedata/master/material/index.vue b/lms/nladmin-ui/src/views/wms/basedata/master/material/index.vue index 46c32a441..13a7cd9a5 100644 --- a/lms/nladmin-ui/src/views/wms/basedata/master/material/index.vue +++ b/lms/nladmin-ui/src/views/wms/basedata/master/material/index.vue @@ -264,9 +264,6 @@ export default { material_name: [ { required: true, message: '物料名称不能为空', trigger: 'blur' } ], - material_type_id: [ - { required: true, message: '物料分类不能为空', trigger: 'blur' } - ], create_id: [ { required: true, message: '不能为空', trigger: 'blur' } ], diff --git a/lms/nladmin-ui/src/views/wms/pub/StructDialog.vue b/lms/nladmin-ui/src/views/wms/pub/StructDialog.vue new file mode 100644 index 000000000..c651e3dbc --- /dev/null +++ b/lms/nladmin-ui/src/views/wms/pub/StructDialog.vue @@ -0,0 +1,201 @@ + + + + diff --git a/lms/nladmin-ui/src/views/wms/st/inbill/AddDialog.vue b/lms/nladmin-ui/src/views/wms/st/inbill/AddDialog.vue new file mode 100644 index 000000000..f8bcfffa9 --- /dev/null +++ b/lms/nladmin-ui/src/views/wms/st/inbill/AddDialog.vue @@ -0,0 +1,400 @@ + + + + + diff --git a/lms/nladmin-ui/src/views/wms/st/inbill/AddDtl.vue b/lms/nladmin-ui/src/views/wms/st/inbill/AddDtl.vue new file mode 100644 index 000000000..cd3631df5 --- /dev/null +++ b/lms/nladmin-ui/src/views/wms/st/inbill/AddDtl.vue @@ -0,0 +1,171 @@ + + + + diff --git a/lms/nladmin-ui/src/views/wms/st/inbill/BucketDtlDialog.vue b/lms/nladmin-ui/src/views/wms/st/inbill/BucketDtlDialog.vue new file mode 100644 index 000000000..f1f15982c --- /dev/null +++ b/lms/nladmin-ui/src/views/wms/st/inbill/BucketDtlDialog.vue @@ -0,0 +1,113 @@ + + + + diff --git a/lms/nladmin-ui/src/views/wms/st/inbill/DivDialog.vue b/lms/nladmin-ui/src/views/wms/st/inbill/DivDialog.vue new file mode 100644 index 000000000..0197be380 --- /dev/null +++ b/lms/nladmin-ui/src/views/wms/st/inbill/DivDialog.vue @@ -0,0 +1,627 @@ + + + + + diff --git a/lms/nladmin-ui/src/views/wms/st/inbill/StructUpdateDialog.vue b/lms/nladmin-ui/src/views/wms/st/inbill/StructUpdateDialog.vue new file mode 100644 index 000000000..8b303c36c --- /dev/null +++ b/lms/nladmin-ui/src/views/wms/st/inbill/StructUpdateDialog.vue @@ -0,0 +1,268 @@ + + + + + + diff --git a/lms/nladmin-ui/src/views/wms/st/inbill/TaskDialog.vue b/lms/nladmin-ui/src/views/wms/st/inbill/TaskDialog.vue new file mode 100644 index 000000000..48db4879d --- /dev/null +++ b/lms/nladmin-ui/src/views/wms/st/inbill/TaskDialog.vue @@ -0,0 +1,401 @@ + + + + + diff --git a/lms/nladmin-ui/src/views/wms/st/inbill/ViewDialog.vue b/lms/nladmin-ui/src/views/wms/st/inbill/ViewDialog.vue new file mode 100644 index 000000000..93c1cc984 --- /dev/null +++ b/lms/nladmin-ui/src/views/wms/st/inbill/ViewDialog.vue @@ -0,0 +1,289 @@ + + + + + diff --git a/lms/nladmin-ui/src/views/wms/st/inbill/index.vue b/lms/nladmin-ui/src/views/wms/st/inbill/index.vue index b9a753ff7..ec1396cfa 100644 --- a/lms/nladmin-ui/src/views/wms/st/inbill/index.vue +++ b/lms/nladmin-ui/src/views/wms/st/inbill/index.vue @@ -8,442 +8,386 @@ :inline="true" class="demo-form-inline" label-position="right" - label-width="90px" + label-width="80px" label-suffix=":" > - + - - - - - - - - - - + + + + + + + + + + - - + + @change="crud.toQuery" + > + + - - + + @change="crud.toQuery" + > + + - - - - - - - + + - 生成任务 + 分配 + + + 作业任务 + + + 强制确认 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- 取消 - 确认 -
- - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - + + + + - - diff --git a/lms/nladmin-ui/src/views/wms/st/inbill/rawassist.js b/lms/nladmin-ui/src/views/wms/st/inbill/rawassist.js new file mode 100644 index 000000000..af4b7b187 --- /dev/null +++ b/lms/nladmin-ui/src/views/wms/st/inbill/rawassist.js @@ -0,0 +1,197 @@ +import request from '@/utils/request' + +export function add(data) { + return request({ + url: '/api/in/rawAssist', + method: 'post', + data + }) +} + +export function del(ids) { + return request({ + url: '/api/in/rawAssist', + method: 'delete', + data: ids + }) +} + +export function edit(data) { + return request({ + url: '/api/in/rawAssist', + method: 'put', + data + }) +} + +export function getType(params) { + return request({ + url: '/api/in/rawAssist/getType', + method: 'get', + params + }) +} + +export function getBillDtl(params) { + return request({ + url: '/api/in/rawAssist/getBillDtl', + method: 'get', + params + }) +} + +export function getIODtl(params) { + return request({ + url: '/api/in/rawAssist/getIODtl', + method: 'get', + params + }) +} + +export function insertDtl(data) { + return request({ + url: '/api/in/rawAssist/insertDtl', + method: 'post', + data + }) +} + +export function commit(data) { + return request({ + url: '/api/in/rawAssist/commit', + method: 'post', + data + }) +} + +export function checkVehicle(data) { + return request({ + url: '/api/in/rawAssist/checkVehicle', + method: 'post', + data + }) +} + +export function confirmvehicle(data) { + return request({ + url: '/api/in/rawAssist/confirmvehicle', + method: 'post', + data + }) +} + +export function deleteDisDtl(data) { + return request({ + url: '/api/in/rawAssist/deleteDisDtl', + method: 'post', + data + }) +} + +export function getDisDtl(data) { + return request({ + url: '/api/in/rawAssist/getDisDtl', + method: 'post', + data + }) +} + +export function divStruct(data) { + return request({ + url: '/api/in/rawAssist/divStruct', + method: 'post', + data + }) +} + +export function unDivStruct(data) { + return request({ + url: '/api/in/rawAssist/unDivStruct', + method: 'post', + data + }) +} + +export function divPoint(data) { + return request({ + url: '/api/in/rawAssist/divPoint', + method: 'post', + data + }) +} + +export function queryTask(data) { + return request({ + url: '/api/in/rawAssist/queryTask', + method: 'post', + data + }) +} + +export function bucketDtl(data) { + return request({ + url: '/api/in/rawAssist/bucketDtl', + method: 'post', + data + }) +} + +export function updateTask(data) { + return request({ + url: '/api/in/rawAssist/updateTask', + method: 'post', + data + }) +} + +export function delTask(data) { + return request({ + url: '/api/in/rawAssist/delTask', + method: 'post', + data + }) +} + +export function reIssueTask(data) { + return request({ + url: '/api/in/rawAssist/reIssueTask', + method: 'post', + data + }) +} + +export function confirmTask(data) { + return request({ + url: '/api/in/rawAssist/confirmTask', + method: 'post', + data + }) +} + +export function cancelTask(data) { + return request({ + url: '/api/in/rawAssist/cancelTask', + method: 'post', + data + }) +} + +export function confirm(data) { + return request({ + url: '/api/in/rawAssist/confirm', + method: 'post', + data + }) +} + +export function backConfirm(data) { + return request({ + url: '/api/in/rawAssist/backConfirm', + method: 'post', + data + }) +} + +export default { add, edit, del, getType, getBillDtl, insertDtl, getIODtl, commit, checkVehicle, + confirmvehicle, deleteDisDtl, getDisDtl, divStruct, unDivStruct, divPoint, + queryTask, bucketDtl, updateTask, delTask, reIssueTask, confirmTask, cancelTask, confirm, backConfirm } diff --git a/lms/nladmin-ui/src/views/wms/st/inbill/regionioIn.js b/lms/nladmin-ui/src/views/wms/st/inbill/regionioIn.js deleted file mode 100644 index 0bb1ff811..000000000 --- a/lms/nladmin-ui/src/views/wms/st/inbill/regionioIn.js +++ /dev/null @@ -1,35 +0,0 @@ -import request from '@/utils/request' - -export function add(data) { - return request({ - url: 'api/regionioIn', - method: 'post', - data - }) -} - -export function del(ids) { - return request({ - url: 'api/regionioIn/', - method: 'delete', - data: ids - }) -} - -export function edit(data) { - return request({ - url: 'api/regionioIn', - method: 'put', - data - }) -} - -export function createTask(data) { - return request({ - url: 'api/regionioIn/createTask', - method: 'post', - data - }) -} - -export default { add, edit, del, createTask } diff --git a/lms/nladmin-ui/src/views/wms/st/outbill/AddDialog.vue b/lms/nladmin-ui/src/views/wms/st/outbill/AddDialog.vue new file mode 100644 index 000000000..ed13416fd --- /dev/null +++ b/lms/nladmin-ui/src/views/wms/st/outbill/AddDialog.vue @@ -0,0 +1,502 @@ + + + + + diff --git a/lms/nladmin-ui/src/views/wms/st/outbill/AddDtl.vue b/lms/nladmin-ui/src/views/wms/st/outbill/AddDtl.vue new file mode 100644 index 000000000..1526fbc87 --- /dev/null +++ b/lms/nladmin-ui/src/views/wms/st/outbill/AddDtl.vue @@ -0,0 +1,137 @@ + + + + diff --git a/lms/nladmin-ui/src/views/wms/st/outbill/DivDialog.vue b/lms/nladmin-ui/src/views/wms/st/outbill/DivDialog.vue new file mode 100644 index 000000000..328521282 --- /dev/null +++ b/lms/nladmin-ui/src/views/wms/st/outbill/DivDialog.vue @@ -0,0 +1,502 @@ + + + + + diff --git a/lms/nladmin-ui/src/views/wms/st/outbill/MaterDialog.vue b/lms/nladmin-ui/src/views/wms/st/outbill/MaterDialog.vue deleted file mode 100644 index 6a90bc566..000000000 --- a/lms/nladmin-ui/src/views/wms/st/outbill/MaterDialog.vue +++ /dev/null @@ -1,165 +0,0 @@ - - - - - diff --git a/lms/nladmin-ui/src/views/wms/st/outbill/StructIvt.vue b/lms/nladmin-ui/src/views/wms/st/outbill/StructIvt.vue new file mode 100644 index 000000000..15694bf26 --- /dev/null +++ b/lms/nladmin-ui/src/views/wms/st/outbill/StructIvt.vue @@ -0,0 +1,245 @@ + + + diff --git a/lms/nladmin-ui/src/views/wms/st/outbill/TaskDialog.vue b/lms/nladmin-ui/src/views/wms/st/outbill/TaskDialog.vue new file mode 100644 index 000000000..34cf30c22 --- /dev/null +++ b/lms/nladmin-ui/src/views/wms/st/outbill/TaskDialog.vue @@ -0,0 +1,324 @@ + + + + + diff --git a/lms/nladmin-ui/src/views/wms/st/outbill/ViewDialog.vue b/lms/nladmin-ui/src/views/wms/st/outbill/ViewDialog.vue new file mode 100644 index 000000000..79d2d17dc --- /dev/null +++ b/lms/nladmin-ui/src/views/wms/st/outbill/ViewDialog.vue @@ -0,0 +1,289 @@ + + + + + diff --git a/lms/nladmin-ui/src/views/wms/st/outbill/checkoutbill.js b/lms/nladmin-ui/src/views/wms/st/outbill/checkoutbill.js new file mode 100644 index 000000000..4af94a5e0 --- /dev/null +++ b/lms/nladmin-ui/src/views/wms/st/outbill/checkoutbill.js @@ -0,0 +1,158 @@ +import request from '@/utils/request' + +export function add(data) { + return request({ + url: 'api/checkoutbill', + method: 'post', + data + }) +} + +export function del(ids) { + return request({ + url: 'api/checkoutbill/', + method: 'delete', + data: ids + }) +} + +export function edit(data) { + return request({ + url: 'api/checkoutbill', + method: 'put', + data + }) +} + +export function getOutBillDtl(params) { + return request({ + url: '/api/checkoutbill/getOutBillDtl', + method: 'get', + params + }) +} +export function getOutBillDis(params) { + return request({ + url: '/api/checkoutbill/getOutBillDis', + method: 'get', + params + }) +} +export function getOutBillDisDtl(params) { + return request({ + url: '/api/checkoutbill/getOutBillDisDtl', + method: 'get', + params + }) +} +export function getOutBillTask(params) { + return request({ + url: '/api/checkoutbill/getOutBillTask', + method: 'get', + params + }) +} +export function getInvTypes() { + return request({ + url: '/api/checkoutbill/getInvTypes', + method: 'get' + }) +} +export function insertDtl(data) { + return request({ + url: '/api/checkoutbill/insertDtl', + method: 'post', + data + }) +} +export function allDiv(data) { + return request({ + url: '/api/checkoutbill/allDiv', + method: 'post', + data + }) +} +export function allCancel(data) { + return request({ + url: '/api/checkoutbill/allCancel', + method: 'post', + data + }) +} +export function setPoint(data) { + return request({ + url: '/api/checkoutbill/setPoint', + method: 'post', + data + }) +} +export function getStructIvt(params) { + return request({ + url: '/api/checkoutbill/getStructIvt', + method: 'get', + params + }) +} +export function manualDiv(data) { + return request({ + url: '/api/checkoutbill/manualDiv', + method: 'post', + data + }) +} +export function confirm(data) { + return request({ + url: '/api/checkoutbill/confirm', + method: 'post', + data + }) +} +export function issueTask(data) { + return request({ + url: '/api/checkoutbill/issueTask', + method: 'post', + data + }) +} +export function finishTask(data) { + return request({ + url: '/api/checkoutbill/finishTask', + method: 'post', + data + }) +} +export function cancleTaskfinish(data) { + return request({ + url: '/api/checkoutbill/cancleTaskfinish', + method: 'post', + data + }) +} +export function paramByCodeType(data) { + return request({ + url: '/api/checkoutbill/paramByCodeType', + method: 'post', + data + }) +} +export function schAreaType(data) { + return request({ + url: '/api/checkoutbill/schAreaType', + method: 'post', + data + }) +} +export function backConfirm(data) { + return request({ + url: '/api/checkoutbill/backConfirm', + method: 'post', + data + }) +} +export function getType() { + return request({ + url: '/api/checkoutbill/getType', + method: 'get' + }) +} +export default { add, edit, del, allDiv, allCancel, getOutBillDtl, getOutBillDis, setPoint, getOutBillTask, getStructIvt, manualDiv, confirm, issueTask, finishTask, cancleTaskfinish, getInvTypes, paramByCodeType, schAreaType,backConfirm, getOutBillDisDtl, getType } diff --git a/lms/nladmin-ui/src/views/wms/st/outbill/index.vue b/lms/nladmin-ui/src/views/wms/st/outbill/index.vue index 3c4f931c7..14837f0dc 100644 --- a/lms/nladmin-ui/src/views/wms/st/outbill/index.vue +++ b/lms/nladmin-ui/src/views/wms/st/outbill/index.vue @@ -8,99 +8,102 @@ :inline="true" class="demo-form-inline" label-position="right" - label-width="90px" + label-width="80px" label-suffix=":" > - + - - - - - - - - - - + + + + + + + + + + - - + + @change="crud.toQuery" + > + + - - + + @change="crud.toQuery" + > + + - - - - - - - + @@ -111,341 +114,253 @@ type="success" icon="el-icon-position" size="mini" - :loading="loading" - :disabled="crud.selections.length !== 1" - @click="createTask" + :disabled="dis_flag" + @click="divOpen" > - 生成任务 + 分配 + + + 作业任务 + + + 强制确认 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- 取消 - 确认 -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + - - + + + + - - diff --git a/lms/nladmin-ui/src/views/wms/st/outbill/regionioOut.js b/lms/nladmin-ui/src/views/wms/st/outbill/regionioOut.js deleted file mode 100644 index 8b82168bb..000000000 --- a/lms/nladmin-ui/src/views/wms/st/outbill/regionioOut.js +++ /dev/null @@ -1,35 +0,0 @@ -import request from '@/utils/request' - -export function add(data) { - return request({ - url: 'api/regionioOut', - method: 'post', - data - }) -} - -export function del(ids) { - return request({ - url: 'api/regionioOut/', - method: 'delete', - data: ids - }) -} - -export function edit(data) { - return request({ - url: 'api/regionioOut', - method: 'put', - data - }) -} - -export function createTask(data) { - return request({ - url: 'api/regionioOut/createTask', - method: 'post', - data - }) -} - -export default { add, edit, del, createTask }