From 1a638e9d149590fac8c976b29865943ad88b960e Mon Sep 17 00:00:00 2001 From: lyd <1419499670@qq.com> Date: Sun, 9 Oct 2022 15:33:32 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E5=86=B7=E5=8D=B4=E5=8C=BA=E5=BA=93?= =?UTF-8?q?=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/nl/modules/wql/util/WqlUtil.java | 2 + .../pdm/ivt/service/dto/CoolPointIvtDto.java | 3 + .../service/impl/CoolPointIvtServiceImpl.java | 140 +++++---- .../nl/wms/pdm/wql/ST_IVT_COOLPOINTIVT.wql | 86 ++++++ .../{stIvtCoolpointivt.js => coolpointivt.js} | 0 .../views/wms/pdm/ivt/coolpointivt/index.vue | 286 +++++++++++++----- 6 files changed, 385 insertions(+), 132 deletions(-) create mode 100644 nladmin-system/src/main/java/org/nl/wms/pdm/wql/ST_IVT_COOLPOINTIVT.wql rename nladmin-ui/src/views/wms/pdm/ivt/coolpointivt/{stIvtCoolpointivt.js => coolpointivt.js} (100%) diff --git a/nladmin-system/src/main/java/org/nl/modules/wql/util/WqlUtil.java b/nladmin-system/src/main/java/org/nl/modules/wql/util/WqlUtil.java index e75d1a534..3835e4da0 100644 --- a/nladmin-system/src/main/java/org/nl/modules/wql/util/WqlUtil.java +++ b/nladmin-system/src/main/java/org/nl/modules/wql/util/WqlUtil.java @@ -43,6 +43,8 @@ public class WqlUtil { str = e.toString(); } else if ("java.lang.Double".equals(classStr)) { str = String.valueOf(o); + } else if ("java.math.BigInteger".equals(classStr)) { + str = String.valueOf(o); } else if ("oracle.sql.CLOB".equals(classStr)) { /* CLOB e2 = (CLOB) o; diff --git a/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/dto/CoolPointIvtDto.java b/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/dto/CoolPointIvtDto.java index 4623dae31..6416a9ec5 100644 --- a/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/dto/CoolPointIvtDto.java +++ b/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/dto/CoolPointIvtDto.java @@ -92,6 +92,9 @@ public class CoolPointIvtDto implements Serializable { /** 满轴位状态 */ private String full_point_status; + /** 库存状态 **/ + private String cool_ivt_status; + /** 空轴位状态 */ private String empty_point_status; } diff --git a/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/impl/CoolPointIvtServiceImpl.java b/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/impl/CoolPointIvtServiceImpl.java index 9439fd420..e3af95b29 100644 --- a/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/impl/CoolPointIvtServiceImpl.java +++ b/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/impl/CoolPointIvtServiceImpl.java @@ -12,7 +12,7 @@ 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.ResultBean; +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.pdm.ivt.service.CoolPointIvtService; @@ -21,6 +21,7 @@ import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.util.HashMap; import java.util.List; import java.util.Map; @@ -34,98 +35,109 @@ import java.util.Map; @Slf4j public class CoolPointIvtServiceImpl implements CoolPointIvtService { -@Override -public Map queryAll(Map whereJson, Pageable page){ - WQLObject wo = WQLObject.getWQLObject("st_ivt_coolpointivt"); - ResultBean rb = wo.pagequery(WqlUtil.getHttpContext(page), "1=1", "update_time desc"); - final JSONObject json = rb.pageResult(); - return json; -} + @Override + public Map queryAll(Map whereJson, Pageable page){ + HashMap map = new HashMap(); + map.put("flag", "1"); + if (whereJson.get("point_code")!=null) + map.put("point_code", "%" + whereJson.get("point_code") + "%"); + if (whereJson.get("container_name")!=null) + map.put("container_name", "%" + whereJson.get("container_name") + "%"); + map.put("full_point_status", whereJson.get("full_point_status")); + map.put("empty_point_status", whereJson.get("empty_point_status")); + map.put("cool_ivt_status", whereJson.get("cool_ivt_status")); + map.put("product_area", whereJson.get("product_area")); + map.put("is_used", whereJson.get("is_used")); + map.put("begin_time", whereJson.get("begin_time")); + map.put("end_time", whereJson.get("end_time")); + JSONObject json = WQL.getWO("ST_IVT_COOLPOINTIVT").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "update_time desc"); + return json; + } -@Override -public List queryAll(Map whereJson){ - WQLObject wo = WQLObject.getWQLObject("st_ivt_coolpointivt"); - JSONArray arr = wo.query().getResultJSONArray(0); - if (ObjectUtil.isNotEmpty(arr)) return arr.toJavaList(CoolPointIvtDto.class); - return null; + @Override + public List queryAll(Map whereJson){ + WQLObject wo = WQLObject.getWQLObject("st_ivt_coolpointivt"); + JSONArray arr = wo.query().getResultJSONArray(0); + if (ObjectUtil.isNotEmpty(arr)) return arr.toJavaList(CoolPointIvtDto.class); + return null; } @Override public CoolPointIvtDto findById(Long ivt_id) { - WQLObject wo = WQLObject.getWQLObject("st_ivt_coolpointivt"); - JSONObject json = wo.query("ivt_id = '" + ivt_id + "'").uniqueResult(0); - if (ObjectUtil.isNotEmpty(json)){ - return json.toJavaObject( CoolPointIvtDto.class); - } - return null; + WQLObject wo = WQLObject.getWQLObject("st_ivt_coolpointivt"); + JSONObject json = wo.query("ivt_id = '" + ivt_id + "'").uniqueResult(0); + if (ObjectUtil.isNotEmpty(json)){ + return json.toJavaObject( CoolPointIvtDto.class); + } + return null; } @Override public CoolPointIvtDto findByCode(String code) { - WQLObject wo = WQLObject.getWQLObject("st_ivt_coolpointivt"); - JSONObject json = wo.query("code ='" + code + "'").uniqueResult(0); - if (ObjectUtil.isNotEmpty(json)){ - return json.toJavaObject( CoolPointIvtDto.class); - } - return null; + WQLObject wo = WQLObject.getWQLObject("st_ivt_coolpointivt"); + JSONObject json = wo.query("code ='" + code + "'").uniqueResult(0); + if (ObjectUtil.isNotEmpty(json)){ + return json.toJavaObject( CoolPointIvtDto.class); + } + return null; } @Override @Transactional(rollbackFor = Exception.class) public void create(CoolPointIvtDto dto) { - Long currentUserId = SecurityUtils.getCurrentUserId(); - String nickName = SecurityUtils.getCurrentNickName(); - String now = DateUtil.now(); + Long currentUserId = SecurityUtils.getCurrentUserId(); + String nickName = SecurityUtils.getCurrentNickName(); + String now = DateUtil.now(); - dto.setIvt_id(IdUtil.getSnowflake(1, 1).nextId()); - dto.setCreate_id(currentUserId); - dto.setCreate_name(nickName); - dto.setUpdate_optid(currentUserId); - dto.setUpdate_optname(nickName); - dto.setUpdate_time(now); - dto.setCreate_time(now); + dto.setIvt_id(IdUtil.getSnowflake(1, 1).nextId()); + dto.setCreate_id(currentUserId); + dto.setCreate_name(nickName); + dto.setUpdate_optid(currentUserId); + dto.setUpdate_optname(nickName); + dto.setUpdate_time(now); + dto.setCreate_time(now); - WQLObject wo = WQLObject.getWQLObject("st_ivt_coolpointivt"); - JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto)); - wo.insert(json); + WQLObject wo = WQLObject.getWQLObject("st_ivt_coolpointivt"); + JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto)); + wo.insert(json); } @Override @Transactional(rollbackFor = Exception.class) public void update(CoolPointIvtDto dto) { - CoolPointIvtDto entity = this.findById(dto.getIvt_id()); - if (entity == null) throw new BadRequestException("被删除或无权限，操作失败!"); + CoolPointIvtDto entity = this.findById(dto.getIvt_id()); + if (entity == null) throw new BadRequestException("被删除或无权限，操作失败!"); - Long currentUserId = SecurityUtils.getCurrentUserId(); - String nickName = SecurityUtils.getCurrentNickName(); + Long currentUserId = SecurityUtils.getCurrentUserId(); + String nickName = SecurityUtils.getCurrentNickName(); - String now = DateUtil.now(); - dto.setUpdate_time(now); - dto.setUpdate_optid(currentUserId); - dto.setUpdate_optname(nickName); + String now = DateUtil.now(); + dto.setUpdate_time(now); + dto.setUpdate_optid(currentUserId); + dto.setUpdate_optname(nickName); - WQLObject wo = WQLObject.getWQLObject("st_ivt_coolpointivt"); - JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto)); - wo.update(json); + WQLObject wo = WQLObject.getWQLObject("st_ivt_coolpointivt"); + JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto)); + wo.update(json); } @Override @Transactional(rollbackFor = Exception.class) public void deleteAll(Long[] ids) { - Long currentUserId = SecurityUtils.getCurrentUserId(); - String nickName = SecurityUtils.getCurrentNickName(); - String now = DateUtil.now(); + Long currentUserId = SecurityUtils.getCurrentUserId(); + String nickName = SecurityUtils.getCurrentNickName(); + String now = DateUtil.now(); - WQLObject wo = WQLObject.getWQLObject("st_ivt_coolpointivt"); - for (Long ivt_id: ids) { - JSONObject param = new JSONObject(); - param.put("ivt_id", String.valueOf(ivt_id)); - param.put("is_delete", "1"); - param.put("update_optid", currentUserId); - param.put("update_optname", nickName); - param.put("update_time", now); - wo.update(param); - } + WQLObject wo = WQLObject.getWQLObject("st_ivt_coolpointivt"); + for (Long ivt_id: ids) { + JSONObject param = new JSONObject(); + param.put("ivt_id", String.valueOf(ivt_id)); + param.put("is_delete", "1"); + param.put("update_optid", currentUserId); + param.put("update_optname", nickName); + param.put("update_time", now); + wo.update(param); + } } - } +} diff --git a/nladmin-system/src/main/java/org/nl/wms/pdm/wql/ST_IVT_COOLPOINTIVT.wql b/nladmin-system/src/main/java/org/nl/wms/pdm/wql/ST_IVT_COOLPOINTIVT.wql new file mode 100644 index 000000000..d3356af1b --- /dev/null +++ b/nladmin-system/src/main/java/org/nl/wms/pdm/wql/ST_IVT_COOLPOINTIVT.wql @@ -0,0 +1,86 @@ +[交易说明] + 交易名： 冷却区点位库存 + 所属模块： + 功能简述： + 版权所有： + 表引用： + 版本经历： + +[数据库] + --指定数据库，为空采用默认值，默认为db.properties中列出的第一个库 + +[IO定义] + ################################################# + ## 表字段对应输入参数 + ################################################# + 输入.flag TYPEAS s_string + 输入.point_code TYPEAS s_string + 输入.container_name TYPEAS s_string + 输入.full_point_status TYPEAS s_string + 输入.empty_point_status TYPEAS s_string + 输入.cool_ivt_status TYPEAS s_string + 输入.product_area TYPEAS s_string + 输入.is_used TYPEAS s_string + 输入.begin_time TYPEAS s_string + 输入.end_time TYPEAS s_string + + +[临时表] + --这边列出来的临时表就会在运行期动态创建 + +[临时变量] + --所有中间过程变量均可在此处定义 + +[业务过程] + + ########################################## + # 1、输入输出检查 # + ########################################## + + + ########################################## + # 2、主过程前处理 # + ########################################## + + + ########################################## + # 3、业务主过程 # + ########################################## + IF 输入.flag = "1" + PAGEQUERY + SELECT + cool.* + FROM + st_ivt_coolpointivt cool + WHERE + 1=1 + OPTION 输入.point_code <> "" + point_code LIKE 输入.point_code + ENDOPTION + OPTION 输入.container_name <> "" + container_name LIKE 输入.container_name + ENDOPTION + OPTION 输入.full_point_status <> "" + full_point_status = 输入.full_point_status + ENDOPTION + OPTION 输入.empty_point_status <> "" + empty_point_status = 输入.empty_point_status + ENDOPTION + OPTION 输入.cool_ivt_status <> "" + cool_ivt_status = 输入.cool_ivt_status + ENDOPTION + OPTION 输入.product_area <> "" + product_area = 输入.product_area + ENDOPTION + OPTION 输入.is_used <> "" + is_used = 输入.is_used + ENDOPTION + OPTION 输入.begin_time <> "" + instorage_time => 输入.begin_time + ENDOPTION + OPTION 输入.end_tiem <> "" + instorage_time <= 输入.end_time + ENDOPTION + ENDSELECT + ENDPAGEQUERY + ENDIF \ No newline at end of file diff --git a/nladmin-ui/src/views/wms/pdm/ivt/coolpointivt/stIvtCoolpointivt.js b/nladmin-ui/src/views/wms/pdm/ivt/coolpointivt/coolpointivt.js similarity index 100% rename from nladmin-ui/src/views/wms/pdm/ivt/coolpointivt/stIvtCoolpointivt.js rename to nladmin-ui/src/views/wms/pdm/ivt/coolpointivt/coolpointivt.js diff --git a/nladmin-ui/src/views/wms/pdm/ivt/coolpointivt/index.vue b/nladmin-ui/src/views/wms/pdm/ivt/coolpointivt/index.vue index 3e2568370..efc14e7a1 100644 --- a/nladmin-ui/src/views/wms/pdm/ivt/coolpointivt/index.vue +++ b/nladmin-ui/src/views/wms/pdm/ivt/coolpointivt/index.vue @@ -4,71 +4,190 @@
- - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
- - + + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - + - - - - + - + + + - + + + + + + + +
@@ -80,20 +199,41 @@ + + + - + + + - + + + - + + + - + - + + + @@ -101,6 +241,7 @@ @@ -112,43 +253,48 @@ + + From 01b34aa8080857d07a48b3fbbffaea67d95f23f8 Mon Sep 17 00:00:00 2001 From: ldj_willow Date: Sun, 9 Oct 2022 16:20:43 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/org/nl/wms/pdm/wql/pdm.xls | Bin 230912 -> 230912 bytes .../views/wms/pdm/ivt/hotpointivt/index.vue | 10 ++++------ 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/nladmin-system/src/main/java/org/nl/wms/pdm/wql/pdm.xls b/nladmin-system/src/main/java/org/nl/wms/pdm/wql/pdm.xls index f781f689706f64fa600cfc418d7a9a39fd6ac63e..9928a7ce087acf4bcbace34bda7a009b532d4a61 100644 GIT binary patch delta 20394 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 RuboZT;ugb<+4N$U{{nSeA9Vl# delta 20967 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 + - + - + - - - - + @@ -94,10 +204,24 @@ import pagination from '@crud/Pagination' const defaultForm = { ivt_id: null, point_code: null, full_point_code: null, full_point_status: null, container_name: null, full_vehicle_code: null, empty_point_code: null, empty_point_status: null, empty_vehicle_code: null, product_area: null, point_location: null, sort_seq: null, is_used: null, remark: null, create_id: null, create_name: null, create_time: null, update_optid: null, update_optname: null, update_time: null } export default { name: 'Cutpointivt', + dicts: ['sch_full_point_status', 'sch_empty_point_status', 'product_area', 'is_used', 'point_location'], components: { pagination, crudOperation, rrOperation, udOperation }, mixins: [presenter(), header(), form(defaultForm), crud()], cruds() { - return CRUD({ title: '分切区点库存', url: 'api/cutpointivt', idField: 'ivt_id', sort: 'ivt_id,desc', crudMethod: { ...crudCutpointivt }}) + return CRUD({ + title: '分切区点库存', + url: 'api/cutpointivt', + idField: 'ivt_id', + sort: 'ivt_id,desc', + crudMethod: { ...crudCutpointivt }, + optShow: { + add: false, + edit: true, + del: false, + download: false, + reset: true + } + }) }, data() { return { @@ -125,6 +249,9 @@ export default { // 钩子：在获取表格数据之前执行，false 则代表不获取数据 [CRUD.HOOK.beforeRefresh]() { return true + }, + hand(value) { + this.crud.toQuery() } } } From 0e4bae7baf85fac443c74d0c6d45005b4b65962a Mon Sep 17 00:00:00 2001 From: liuxy Date: Sun, 9 Oct 2022 16:27:20 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mes/service/impl/MesToLmsServiceImpl.java | 112 ++++- .../SlittingproductionplanController.java | 101 +++++ .../SlittingproductionplanService.java | 102 +++++ .../dto/SlittingproductionplanDto.java | 141 ++++++ .../impl/RawfoilworkorderServiceImpl.java | 2 +- .../SlittingproductionplanServiceImpl.java | 238 ++++++++++ .../wms/pdm/wql/PDM_BI_SLIDTTINGPLAN_01.wql | 94 ++++ .../wms/pdm/order/slittingplan/index.vue | 421 ++++++++++++++++++ .../slittingplan/slittingproductionplan.js | 59 +++ 9 files changed, 1263 insertions(+), 7 deletions(-) create mode 100644 nladmin-system/src/main/java/org/nl/wms/pdm/rest/SlittingproductionplanController.java create mode 100644 nladmin-system/src/main/java/org/nl/wms/pdm/service/SlittingproductionplanService.java create mode 100644 nladmin-system/src/main/java/org/nl/wms/pdm/service/dto/SlittingproductionplanDto.java create mode 100644 nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/SlittingproductionplanServiceImpl.java create mode 100644 nladmin-system/src/main/java/org/nl/wms/pdm/wql/PDM_BI_SLIDTTINGPLAN_01.wql create mode 100644 nladmin-ui/src/views/wms/pdm/order/slittingplan/index.vue create mode 100644 nladmin-ui/src/views/wms/pdm/order/slittingplan/slittingproductionplan.js diff --git a/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/MesToLmsServiceImpl.java b/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/MesToLmsServiceImpl.java index 12cb19589..9413b6189 100644 --- a/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/MesToLmsServiceImpl.java +++ b/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/MesToLmsServiceImpl.java @@ -3,6 +3,7 @@ package org.nl.wms.ext.mes.service.impl; import cn.hutool.core.date.DateUtil; 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; @@ -81,7 +82,7 @@ public class MesToLmsServiceImpl implements MesToLmsService { json.put("product_area", jsonPoint.getString("product_area")); json.put("point_code", jsonPoint.getString("point_code")); json.put("realstart_time", DateUtil.now()); - json.put("status", "01"); + json.put("status", "1"); json.put("is_delete", "0"); json.put("agvno", "0"); json.put("productin_qty", 0); @@ -176,12 +177,111 @@ public class MesToLmsServiceImpl implements MesToLmsService { @Override public JSONObject cutPlanTransfer(JSONObject param) { log.info("cutPlanTransfer接口输入参数为：-------------------"+param.toString()); + + String orderType = param.getString("OrderType"); // 分切订单类型 + String ContainerName = param.getString("ContainerName"); // 子卷号 + String ProductName = param.getString("ProductName"); // 产品编码 + String Description = param.getString("Description"); // 产品名称 + String Warehouse = param.getString("Warehouse"); // 来源卷位置 + String ResourceName = param.getString("ResourceName"); // 分切机台编码 + String SplitGroup = param.getString("SplitGroup"); // 分切组 + String ManufactureSort = param.getString("ManufactureSort"); // 生产顺序 + String MfgOrderName = param.getString("MfgOrderName"); // 生产订单 + String ManufactureDate = param.getString("ManufactureDate"); // 生产日期 + String PaperTubeOrFRP = param.getString("PaperTubeOrFRP"); // 管件类型 + String SplitBreadth = param.getString("SplitBreadth"); // 子卷幅宽 + String SplitHeight = param.getString("SplitHeight"); // 子卷理论长度 + String SplitWeight = param.getString("SplitWeight"); // 子卷理论重量 + + WQLObject tab = WQLObject.getWQLObject("PDM_BI_SlittingProductionPlan"); + JSONObject result = new JSONObject(); - result.put("RTYPE", "S"); - result.put("RTMSG", "操作成功!"); - result.put("RTOAL", 1); - result.put("RTDAT", null); - System.out.println(result); + try { + // 基础校验 + if (ObjectUtil.isEmpty(orderType)) throw new BadRequestException("分切订单类型不能为空"); + if (ObjectUtil.isEmpty(ContainerName)) throw new BadRequestException("子卷号不能为空"); + if (ObjectUtil.isEmpty(ProductName)) throw new BadRequestException("产品编码不能为空"); + if (ObjectUtil.isEmpty(Description)) throw new BadRequestException("产品名称不能为空"); + if (ObjectUtil.isEmpty(Warehouse)) throw new BadRequestException("来源卷位置不能为空"); + if (ObjectUtil.isEmpty(ResourceName)) throw new BadRequestException("分切机台编码不能为空"); + if (ObjectUtil.isEmpty(SplitGroup)) throw new BadRequestException("分切组不能为空"); + if (ObjectUtil.isEmpty(ManufactureSort)) throw new BadRequestException("生产顺序不能为空"); + if (ObjectUtil.isEmpty(MfgOrderName)) throw new BadRequestException("生产订单不能为空"); + if (ObjectUtil.isEmpty(ManufactureDate)) throw new BadRequestException("生产日期不能为空"); + if (ObjectUtil.isEmpty(PaperTubeOrFRP)) throw new BadRequestException("管件类型不能为空"); + if (ObjectUtil.isEmpty(SplitBreadth)) throw new BadRequestException("子卷幅宽不能为空"); + if (ObjectUtil.isEmpty(SplitHeight)) throw new BadRequestException("子卷理论长度不能为空"); + if (ObjectUtil.isEmpty(SplitWeight)) throw new BadRequestException("子卷理论重量不能为空"); + + /* orderType + * 1.当订单类型为1（常规）时 ParentContainerName 来源母卷号不能为空 + * 2.当订单类型为2（改制）时 RestructContainerName 改制来源子卷号、PackageBoxSN 子卷立库木箱号 不能为空 + */ + if (StrUtil.equals(orderType, "1")) { + if (ObjectUtil.isEmpty(param.getString("ParentContainerName"))) throw new BadRequestException("来源母卷号不能为空"); + } else { + if (ObjectUtil.isEmpty(param.getString("RestructContainerName"))) throw new BadRequestException("改制来源子卷号不能为空"); + if (ObjectUtil.isEmpty(param.getString("PackageBoxSN"))) throw new BadRequestException("子卷立库木箱号不能为空"); + } + /* PaperTubeOrFRP + * 1.当管件类型为1（纸筒）时 PaperTubeMaterial 纸筒物料编码、PaperTubeDescription 纸筒物料描述、PaperTubeModel 纸筒规格 不能为空 + * 2.当管件类型为2（FRP管）时 FRPMaterial FRP管物料编码、FRPDescription FRP管物料描述、FRPModel FRP管规格 不能为空 + */ + if (StrUtil.equals(PaperTubeOrFRP, "1")) { + if (ObjectUtil.isEmpty(param.getString("PaperTubeMaterial"))) throw new BadRequestException("纸筒物料编码不能为空"); + if (ObjectUtil.isEmpty(param.getString("PaperTubeDescription"))) throw new BadRequestException("纸筒物料描述不能为空"); + if (ObjectUtil.isEmpty(param.getString("PaperTubeModel"))) throw new BadRequestException("纸筒规格不能为空"); + } else { + if (ObjectUtil.isEmpty(param.getString("FRPMaterial"))) throw new BadRequestException("FRP管物料编码不能为空"); + if (ObjectUtil.isEmpty(param.getString("FRPDescription"))) throw new BadRequestException("FRP管物料描述不能为空"); + if (ObjectUtil.isEmpty(param.getString("FRPModel"))) throw new BadRequestException("FRP管规格不能为空"); + } + + JSONObject json = new JSONObject(); + json.put("workorder_id", IdUtil.getSnowflake(1,1).nextId()); + json.put("order_type", orderType); + json.put("container_name", ContainerName); + json.put("product_name", ProductName); + json.put("description", Description); + json.put("parent_container_name", param.getString("ParentContainerName")); + json.put("restruct_container_name", param.getString("RestructContainerName")); + json.put("package_box_sn", param.getString("PackageBoxSN")); + json.put("ware_house", Warehouse); + json.put("resource_name", ResourceName); + json.put("split_group", SplitGroup); + json.put("manufacture_sort", ManufactureSort); + json.put("mfg_order_name", MfgOrderName); + json.put("manufacture_date", ManufactureDate); + json.put("paper_tube_or_FRP", PaperTubeOrFRP); + json.put("paper_tube_material", param.getString("PaperTubeMaterial")); + json.put("paper_tube_description", param.getString("PaperTubeDescription")); + json.put("paper_tube_model", param.getString("PaperTubeModel")); + json.put("FRP_material", param.getString("FRPMaterial")); + json.put("FRP_description", param.getString("FRPDescription")); + json.put("FRP_model", param.getString("FRPModel")); + json.put("split_breadth", SplitBreadth); + json.put("split_height", SplitHeight); + json.put("split_weight", SplitWeight); + json.put("start_time",DateUtil.now()); + json.put("status","1"); + json.put("is_parent_ok","0"); + json.put("is_child_tz_ok","0"); + json.put("is_child_ps_ok","0"); + json.put("is_delete","0"); + tab.insert(json); + + result.put("RTYPE", "S"); + result.put("RTMSG", "操作成功!"); + result.put("RTOAL", 1); + result.put("RTDAT", null); + System.out.println(result); + } catch (Exception e) { + result.put("RTYPE", "S"); + result.put("RTMSG", "操作失败!"+e.getMessage()); + result.put("RTOAL", 0); + result.put("RTDAT", null); + System.out.println(result); + } return result; } diff --git a/nladmin-system/src/main/java/org/nl/wms/pdm/rest/SlittingproductionplanController.java b/nladmin-system/src/main/java/org/nl/wms/pdm/rest/SlittingproductionplanController.java new file mode 100644 index 000000000..99de8e7eb --- /dev/null +++ b/nladmin-system/src/main/java/org/nl/wms/pdm/rest/SlittingproductionplanController.java @@ -0,0 +1,101 @@ + +package org.nl.wms.pdm.rest; + + +import com.alibaba.fastjson.JSONObject; +import org.nl.wms.pdm.service.SlittingproductionplanService; +import org.nl.wms.pdm.service.dto.SlittingproductionplanDto; +import org.springframework.data.domain.Pageable; +import lombok.RequiredArgsConstructor; +import org.nl.modules.logging.annotation.Log; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import cn.dev33.satoken.annotation.SaCheckPermission; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.*; + +import java.util.Map; + +import lombok.extern.slf4j.Slf4j; + +/** + * @author liuxy + * @date 2022-10-09 + **/ +@RestController +@RequiredArgsConstructor +@Api(tags = "分切计划管理") +@RequestMapping("/api/slittingproductionplan") +@Slf4j +public class SlittingproductionplanController { + + private final SlittingproductionplanService slittingproductionplanService; + + @GetMapping + @Log("查询分切计划") + @ApiOperation("查询分切计划") + //@SaCheckPermission("@el.check('slittingproductionplan:list')") + public ResponseEntity query(@RequestParam Map whereJson, Pageable page) { + return new ResponseEntity<>(slittingproductionplanService.queryAll(whereJson, page), HttpStatus.OK); + } + + @PostMapping + @Log("新增分切计划") + @ApiOperation("新增分切计划") + //@SaCheckPermission("@el.check('slittingproductionplan:add')") + public ResponseEntity create(@Validated @RequestBody SlittingproductionplanDto dto) { + slittingproductionplanService.create(dto); + return new ResponseEntity<>(HttpStatus.CREATED); + } + + @PutMapping + @Log("修改分切计划") + @ApiOperation("修改分切计划") + //@SaCheckPermission("@el.check('slittingproductionplan:edit')") + public ResponseEntity update(@Validated @RequestBody SlittingproductionplanDto dto) { + slittingproductionplanService.update(dto); + return new ResponseEntity<>(HttpStatus.NO_CONTENT); + } + + @Log("删除分切计划") + @ApiOperation("删除分切计划") + //@SaCheckPermission("@el.check('slittingproductionplan:del')") + @DeleteMapping + public ResponseEntity delete(@RequestBody Long[] ids) { + slittingproductionplanService.deleteAll(ids); + return new ResponseEntity<>(HttpStatus.OK); + } + + @Log("上料完成") + @ApiOperation("上料完成") + @PostMapping("/upMaterFinish") + public ResponseEntity upMaterFinish(@RequestBody JSONObject whereJson) { + slittingproductionplanService.upMaterFinish(whereJson); + return new ResponseEntity<>(HttpStatus.OK); + } + + @Log("套管完成") + @ApiOperation("套管完成") + @PostMapping("/caseFinish") + public ResponseEntity caseFinish(@RequestBody JSONObject whereJson) { + slittingproductionplanService.caseFinish(whereJson); + return new ResponseEntity<>(HttpStatus.OK); + } + + @Log("配送完成") + @ApiOperation("配送完成") + @PostMapping("/sendFinish") + public ResponseEntity sendFinish(@RequestBody JSONObject whereJson) { + slittingproductionplanService.sendFinish(whereJson); + return new ResponseEntity<>(HttpStatus.OK); + } + + @Log("强制完成") + @ApiOperation("强制完成") + @PostMapping("/compelFinish") + public ResponseEntity compelFinish(@RequestBody JSONObject whereJson) { + slittingproductionplanService.compelFinish(whereJson); + return new ResponseEntity<>(HttpStatus.OK); + } +} diff --git a/nladmin-system/src/main/java/org/nl/wms/pdm/service/SlittingproductionplanService.java b/nladmin-system/src/main/java/org/nl/wms/pdm/service/SlittingproductionplanService.java new file mode 100644 index 000000000..f6b695ae0 --- /dev/null +++ b/nladmin-system/src/main/java/org/nl/wms/pdm/service/SlittingproductionplanService.java @@ -0,0 +1,102 @@ + +package org.nl.wms.pdm.service; + +import com.alibaba.fastjson.JSONObject; +import org.nl.wms.pdm.service.dto.SlittingproductionplanDto; +import org.springframework.data.domain.Pageable; + +import java.util.Map; +import java.util.List; +import java.io.IOException; +import javax.servlet.http.HttpServletResponse; + +/** + * @author liuxy + * @description 服务接口 + * @date 2022-10-09 + **/ +public interface SlittingproductionplanService { + + /** + * 查询数据分页 + * + * @param whereJson 条件 + * @param page 分页参数 + * @return Map + */ + Map queryAll(Map whereJson, Pageable page); + + /** + * 查询所有数据不分页 + * + * @param whereJson 条件参数 + * @return List + */ + List queryAll(Map whereJson); + + /** + * 根据ID查询 + * + * @param workorder_id ID + * @return Slittingproductionplan + */ + SlittingproductionplanDto findById(Long workorder_id); + + /** + * 根据编码查询 + * + * @param code code + * @return Slittingproductionplan + */ + SlittingproductionplanDto findByCode(String code); + + + /** + * 创建 + * + * @param dto / + */ + void create(SlittingproductionplanDto dto); + + /** + * 编辑 + * + * @param dto / + */ + void update(SlittingproductionplanDto dto); + + /** + * 多选删除 + * + * @param ids / + */ + void deleteAll(Long[] ids); + + /** + * 上料完成 + * + * @param whereJson / + */ + void upMaterFinish(JSONObject whereJson); + + /** + * 套管完成 + * + * @param whereJson / + */ + void caseFinish(JSONObject whereJson); + + /** + * 配送完成 + * + * @param whereJson / + */ + void sendFinish(JSONObject whereJson); + + /** + * 强制完成 + * + * @param whereJson / + */ + void compelFinish(JSONObject whereJson); +} diff --git a/nladmin-system/src/main/java/org/nl/wms/pdm/service/dto/SlittingproductionplanDto.java b/nladmin-system/src/main/java/org/nl/wms/pdm/service/dto/SlittingproductionplanDto.java new file mode 100644 index 000000000..3d10cf5e2 --- /dev/null +++ b/nladmin-system/src/main/java/org/nl/wms/pdm/service/dto/SlittingproductionplanDto.java @@ -0,0 +1,141 @@ +package org.nl.wms.pdm.service.dto; + +import lombok.Data; + import java.math.BigDecimal; +import java.io.Serializable; + import com.fasterxml.jackson.databind.annotation.JsonSerialize; + import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; + +/** +* @description / +* @author liuxy +* @date 2022-10-09 +**/ +@Data +public class SlittingproductionplanDto implements Serializable { + + /** 分切计划标识 */ + /** 防止精度丢失 */ + @JsonSerialize(using= ToStringSerializer.class) + private Long workorder_id; + + /** 分切订单类型 */ + private String order_type; + + /** 子卷号 */ + private String container_name; + + /** 产品编码 */ + private String product_name; + + /** 产品描述 */ + private String description; + + /** 来源母卷号 */ + private String parent_container_name; + + /** 改制来源子卷号 */ + private String restruct_container_name; + + /** 子卷立库木箱号 */ + private String package_box_sn; + + /** 来源卷位置 */ + private String ware_house; + + /** 分切机台编码 */ + private String resource_name; + + /** 分切组 */ + private String split_group; + + /** 生产顺序 */ + private BigDecimal manufacture_sort; + + /** 生产订单 */ + private String mfg_order_name; + + /** 生产日期 */ + private String manufacture_date; + + /** 管件类型 */ + private String paper_tube_or_FRP; + + /** 纸筒物料编码 */ + private String paper_tube_material; + + /** 纸筒物料描述 */ + private String paper_tube_description; + + /** 纸筒规格 */ + private String paper_tube_model; + + /** FRP管物料编码 */ + private String FRP_material; + + /** FRP管物料描述 */ + private String FRP_description; + + /** FRP管规格 */ + private String FRP_model; + + /** 子卷幅宽 */ + private BigDecimal split_breadth; + + /** 子卷理论长度 */ + private BigDecimal split_height; + + /** 子卷理论重量 */ + private BigDecimal split_weight; + + /** 开始时间 */ + private String start_time; + + /** 结束时间 */ + private String end_time; + + /** 状态 */ + private String status; + + /** 备注 */ + private String remark; + + /** 创建人 */ + private Long create_id; + + /** 创建人姓名 */ + private String create_name; + + /** 创建时间 */ + private String create_time; + + /** 修改人 */ + private Long update_optid; + + /** 修改人姓名 */ + private String update_optname; + + /** 修改时间 */ + private String update_time; + + /** 部门ID */ + private Long sysdeptid; + + /** 公司ID */ + private Long syscompanyid; + + /** 是否删除 */ + private String is_delete; + + /** 上料完成 */ + private String is_parent_ok; + + /** 子卷套轴完成 */ + private String is_child_tz_ok; + + /** 子卷配送完成 */ + private String is_child_ps_ok; + + /** 气涨轴编码 */ + private String qzzno; +} diff --git a/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/RawfoilworkorderServiceImpl.java b/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/RawfoilworkorderServiceImpl.java index 3f0698a8d..3ccbcd6af 100644 --- a/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/RawfoilworkorderServiceImpl.java +++ b/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/RawfoilworkorderServiceImpl.java @@ -156,7 +156,7 @@ public class RawfoilworkorderServiceImpl implements RawfoilworkorderService { WQLObject tab = WQLObject.getWQLObject("PDM_BI_RawFoilWorkOrder"); JSONObject json = tab.query("workorder_id = '" + workorder_id + "'").uniqueResult(0); - json.put("status", "02"); + json.put("status", "2"); json.put("finish_type", "02"); json.put("realend_time", DateUtil.now()); json.put("update_optid", currentUserId); diff --git a/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/SlittingproductionplanServiceImpl.java b/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/SlittingproductionplanServiceImpl.java new file mode 100644 index 000000000..f95fd3713 --- /dev/null +++ b/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/SlittingproductionplanServiceImpl.java @@ -0,0 +1,238 @@ + +package org.nl.wms.pdm.service.impl; + + +import cn.hutool.core.map.MapUtil; +import cn.hutool.core.util.StrUtil; +import com.alibaba.fastjson.JSON; +import lombok.RequiredArgsConstructor; +import org.nl.modules.common.exception.BadRequestException; +import org.nl.modules.wql.WQL; +import org.nl.wms.pdm.service.SlittingproductionplanService; +import org.nl.wms.pdm.service.dto.SlittingproductionplanDto; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import org.springframework.data.domain.Pageable; + +import java.util.List; +import java.util.Map; + +import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.IdUtil; +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; +import org.nl.modules.common.utils.SecurityUtils; +import org.nl.modules.wql.core.bean.ResultBean; +import org.nl.modules.wql.core.bean.WQLObject; +import org.nl.modules.wql.util.WqlUtil; +import lombok.extern.slf4j.Slf4j; +import cn.hutool.core.util.ObjectUtil; + +/** + * @author liuxy + * @description 服务实现 + * @date 2022-10-09 + **/ +@Service +@RequiredArgsConstructor +@Slf4j +public class SlittingproductionplanServiceImpl implements SlittingproductionplanService { + + @Override + public Map queryAll(Map whereJson, Pageable page) { + String order_type = MapUtil.getStr(whereJson, "order_type"); + String product_area = MapUtil.getStr(whereJson, "product_area"); + String status = MapUtil.getStr(whereJson, "status"); + String resource_name = MapUtil.getStr(whereJson, "resource_name"); + String parent_container_name = MapUtil.getStr(whereJson, "parent_container_name"); + String container_name = MapUtil.getStr(whereJson, "container_name"); + String begin_time = MapUtil.getStr(whereJson, "begin_time"); + String end_time = MapUtil.getStr(whereJson, "end_time"); + + JSONObject map = new JSONObject(); + map.put("flag", "1"); + map.put("order_type", order_type); + map.put("product_area", product_area); + map.put("status", status); + map.put("begin_time", begin_time); + map.put("end_time", end_time); + if (ObjectUtil.isNotEmpty(resource_name)) map.put("resource_name","%"+resource_name+"%"); + if (ObjectUtil.isNotEmpty(parent_container_name)) map.put("parent_container_name","%"+parent_container_name+"%"); + if (ObjectUtil.isNotEmpty(container_name)) map.put("container_name","%"+container_name+"%"); + + JSONObject json = WQL.getWO("PDM_BI_SLIDTTINGPLAN_01").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "plan.update_time DESC"); + return json; + } + + @Override + public List queryAll(Map whereJson) { + WQLObject wo = WQLObject.getWQLObject("pdm_bi_slittingproductionplan"); + JSONArray arr = wo.query().getResultJSONArray(0); + if (ObjectUtil.isNotEmpty(arr)) return arr.toJavaList(SlittingproductionplanDto.class); + return null; + } + + @Override + public SlittingproductionplanDto findById(Long workorder_id) { + WQLObject wo = WQLObject.getWQLObject("pdm_bi_slittingproductionplan"); + JSONObject json = wo.query("workorder_id = '" + workorder_id + "'").uniqueResult(0); + if (ObjectUtil.isNotEmpty(json)) { + return json.toJavaObject(SlittingproductionplanDto.class); + } + return null; + } + + @Override + public SlittingproductionplanDto findByCode(String code) { + WQLObject wo = WQLObject.getWQLObject("pdm_bi_slittingproductionplan"); + JSONObject json = wo.query("code ='" + code + "'").uniqueResult(0); + if (ObjectUtil.isNotEmpty(json)) { + return json.toJavaObject(SlittingproductionplanDto.class); + } + return null; + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void create(SlittingproductionplanDto dto) { + Long currentUserId = SecurityUtils.getCurrentUserId(); + String nickName = SecurityUtils.getCurrentNickName(); + String now = DateUtil.now(); + + dto.setWorkorder_id(IdUtil.getSnowflake(1, 1).nextId()); + dto.setCreate_id(currentUserId); + dto.setCreate_name(nickName); + dto.setUpdate_optid(currentUserId); + dto.setUpdate_optname(nickName); + dto.setUpdate_time(now); + dto.setCreate_time(now); + + WQLObject wo = WQLObject.getWQLObject("pdm_bi_slittingproductionplan"); + JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto)); + wo.insert(json); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void update(SlittingproductionplanDto dto) { + SlittingproductionplanDto entity = this.findById(dto.getWorkorder_id()); + if (entity == null) throw new BadRequestException("被删除或无权限，操作失败!"); + + Long currentUserId = SecurityUtils.getCurrentUserId(); + String nickName = SecurityUtils.getCurrentNickName(); + + String now = DateUtil.now(); + dto.setUpdate_time(now); + dto.setUpdate_optid(currentUserId); + dto.setUpdate_optname(nickName); + + WQLObject wo = WQLObject.getWQLObject("pdm_bi_slittingproductionplan"); + JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto)); + wo.update(json); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void deleteAll(Long[] ids) { + Long currentUserId = SecurityUtils.getCurrentUserId(); + String nickName = SecurityUtils.getCurrentNickName(); + String now = DateUtil.now(); + + WQLObject wo = WQLObject.getWQLObject("pdm_bi_slittingproductionplan"); + for (Long workorder_id : ids) { + JSONObject param = new JSONObject(); + param.put("workorder_id", String.valueOf(workorder_id)); + param.put("is_delete", "1"); + param.put("update_optid", currentUserId); + param.put("update_optname", nickName); + param.put("update_time", now); + wo.update(param); + } + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void upMaterFinish(JSONObject whereJson) { + JSONArray data = whereJson.getJSONArray("data"); + Long currentUserId = SecurityUtils.getCurrentUserId(); + String currentUsername = SecurityUtils.getCurrentUsername(); + + WQLObject tab = WQLObject.getWQLObject("PDM_BI_SlittingProductionPlan"); + + for (int i = 0; i < data.size(); i++) { + JSONObject json = data.getJSONObject(i); + JSONObject jsonObject = tab.query("workorder_id = '" + json.getString("workorder_id") + "'").uniqueResult(0); + jsonObject.put("is_parent_ok","1"); + jsonObject.put("update_optid",currentUserId); + jsonObject.put("update_optname",currentUsername); + jsonObject.put("update_time",DateUtil.now()); + tab.update(jsonObject); + } + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void caseFinish(JSONObject whereJson) { + JSONArray data = whereJson.getJSONArray("data"); + Long currentUserId = SecurityUtils.getCurrentUserId(); + String currentUsername = SecurityUtils.getCurrentUsername(); + + WQLObject tab = WQLObject.getWQLObject("PDM_BI_SlittingProductionPlan"); + + for (int i = 0; i < data.size(); i++) { + JSONObject json = data.getJSONObject(i); + JSONObject jsonObject = tab.query("workorder_id = '" + json.getString("workorder_id") + "'").uniqueResult(0); + jsonObject.put("is_child_tz_ok","1"); + jsonObject.put("update_optid",currentUserId); + jsonObject.put("update_optname",currentUsername); + jsonObject.put("update_time",DateUtil.now()); + tab.update(jsonObject); + } + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void sendFinish(JSONObject whereJson) { + JSONArray data = whereJson.getJSONArray("data"); + Long currentUserId = SecurityUtils.getCurrentUserId(); + String currentUsername = SecurityUtils.getCurrentUsername(); + + WQLObject tab = WQLObject.getWQLObject("PDM_BI_SlittingProductionPlan"); + + for (int i = 0; i < data.size(); i++) { + JSONObject json = data.getJSONObject(i); + JSONObject jsonObject = tab.query("workorder_id = '" + json.getString("workorder_id") + "'").uniqueResult(0); + jsonObject.put("is_child_ps_ok","1"); + jsonObject.put("update_optid",currentUserId); + jsonObject.put("update_optname",currentUsername); + jsonObject.put("update_time",DateUtil.now()); + tab.update(jsonObject); + } + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void compelFinish(JSONObject whereJson) { + JSONArray data = whereJson.getJSONArray("data"); + Long currentUserId = SecurityUtils.getCurrentUserId(); + String currentUsername = SecurityUtils.getCurrentUsername(); + + WQLObject tab = WQLObject.getWQLObject("PDM_BI_SlittingProductionPlan"); + + for (int i = 0; i < data.size(); i++) { + JSONObject json = data.getJSONObject(i); + JSONObject jsonObject = tab.query("workorder_id = '" + json.getString("workorder_id") + "'").uniqueResult(0); + if (StrUtil.equals(jsonObject.getString("status"), "2")) { + throw new BadRequestException("此单号："+jsonObject.getString("mfg_order_name")+"已完成"); + } + jsonObject.put("status","2"); + jsonObject.put("end_time",DateUtil.now()); + jsonObject.put("update_optid",currentUserId); + jsonObject.put("update_optname",currentUsername); + jsonObject.put("update_time",DateUtil.now()); + tab.update(jsonObject); + } + } + +} diff --git a/nladmin-system/src/main/java/org/nl/wms/pdm/wql/PDM_BI_SLIDTTINGPLAN_01.wql b/nladmin-system/src/main/java/org/nl/wms/pdm/wql/PDM_BI_SLIDTTINGPLAN_01.wql new file mode 100644 index 000000000..51a839209 --- /dev/null +++ b/nladmin-system/src/main/java/org/nl/wms/pdm/wql/PDM_BI_SLIDTTINGPLAN_01.wql @@ -0,0 +1,94 @@ +[交易说明] + 交易名： 分切计划查询 + 所属模块： + 功能简述： + 版权所有： + 表引用： + 版本经历： + +[数据库] + --指定数据库，为空采用默认值，默认为db.properties中列出的第一个库 + +[IO定义] + ################################################# + ## 表字段对应输入参数 + ################################################# + 输入.flag TYPEAS s_string + 输入.order_type TYPEAS s_string + 输入.product_area TYPEAS s_string + 输入.status TYPEAS s_string + 输入.resource_name TYPEAS s_string + 输入.parent_container_name TYPEAS s_string + 输入.container_name TYPEAS s_string + 输入.begin_time TYPEAS s_string + 输入.end_time TYPEAS s_string + + +[临时表] + --这边列出来的临时表就会在运行期动态创建 + +[临时变量] + --所有中间过程变量均可在此处定义 + +[业务过程] + + ########################################## + # 1、输入输出检查 # + ########################################## + + + ########################################## + # 2、主过程前处理 # + ########################################## + + + ########################################## + # 3、业务主过程 # + ########################################## + + IF 输入.flag = "1" + PAGEQUERY + SELECT + plan.*, + ivt.product_area + FROM + PDM_BI_SlittingProductionPlan plan + LEFT JOIN ST_IVT_CutPointIvt ivt ON ivt.ext_code = plan.resource_name + WHERE + plan.is_delete = '0' + + OPTION 输入.order_type <> "" + plan.order_type = 输入.order_type + ENDOPTION + + OPTION 输入.product_area <> "" + ivt.product_area = 输入.product_area + ENDOPTION + + OPTION 输入.status <> "" + plan.status = 输入.status + ENDOPTION + + OPTION 输入.resource_name <> "" + plan.resource_name like 输入.resource_name + ENDOPTION + + OPTION 输入.parent_container_name <> "" + plan.parent_container_name like 输入.parent_container_name + ENDOPTION + + OPTION 输入.container_name <> "" + plan.container_name like 输入.container_name + ENDOPTION + + OPTION 输入.begin_time <> "" + plan.manufacture_date >= 输入.begin_time + ENDOPTION + + OPTION 输入.end_time <> "" + plan.manufacture_date <= 输入.end_time + ENDOPTION + + ENDSELECT + ENDPAGEQUERY + ENDIF \ No newline at end of file diff --git a/nladmin-ui/src/views/wms/pdm/order/slittingplan/index.vue b/nladmin-ui/src/views/wms/pdm/order/slittingplan/index.vue new file mode 100644 index 000000000..1b6bb985d --- /dev/null +++ b/nladmin-ui/src/views/wms/pdm/order/slittingplan/index.vue @@ -0,0 +1,421 @@ + + + + + diff --git a/nladmin-ui/src/views/wms/pdm/order/slittingplan/slittingproductionplan.js b/nladmin-ui/src/views/wms/pdm/order/slittingplan/slittingproductionplan.js new file mode 100644 index 000000000..9966502a3 --- /dev/null +++ b/nladmin-ui/src/views/wms/pdm/order/slittingplan/slittingproductionplan.js @@ -0,0 +1,59 @@ +import request from '@/utils/request' + +export function add(data) { + return request({ + url: 'api/slittingproductionplan', + method: 'post', + data + }) +} + +export function del(ids) { + return request({ + url: 'api/slittingproductionplan/', + method: 'delete', + data: ids + }) +} + +export function edit(data) { + return request({ + url: 'api/slittingproductionplan', + method: 'put', + data + }) +} + +export function upMaterFinish(data) { + return request({ + url: 'api/slittingproductionplan/upMaterFinish', + method: 'post', + data + }) +} + +export function caseFinish(data) { + return request({ + url: 'api/slittingproductionplan/caseFinish', + method: 'post', + data + }) +} + +export function sendFinish(data) { + return request({ + url: 'api/slittingproductionplan/sendFinish', + method: 'post', + data + }) +} + +export function compelFinish(data) { + return request({ + url: 'api/slittingproductionplan/compelFinish', + method: 'post', + data + }) +} + +export default { add, edit, del, upMaterFinish, caseFinish, sendFinish, compelFinish } From 22f38f80cf74f2a81e1cfdd527217f94e40f0f15 Mon Sep 17 00:00:00 2001 From: lyd <1419499670@qq.com> Date: Sun, 9 Oct 2022 17:00:18 +0800 Subject: [PATCH 8/8] =?UTF-8?q?=E7=83=98=E7=83=A4=E5=8C=BA=E5=BA=93?= =?UTF-8?q?=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/HotPointIvtServiceImpl.java | 17 +- .../nl/wms/pdm/wql/ST_IVT_COOLPOINTIVT.wql | 4 +- .../org/nl/wms/pdm/wql/ST_IVT_HOTPOINTIVT.wql | 74 +++++++ .../views/wms/pdm/ivt/hotpointivt/index.vue | 182 +++++++++++++----- 4 files changed, 225 insertions(+), 52 deletions(-) create mode 100644 nladmin-system/src/main/java/org/nl/wms/pdm/wql/ST_IVT_HOTPOINTIVT.wql diff --git a/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/impl/HotPointIvtServiceImpl.java b/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/impl/HotPointIvtServiceImpl.java index 3d602df77..5aae32354 100644 --- a/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/impl/HotPointIvtServiceImpl.java +++ b/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/impl/HotPointIvtServiceImpl.java @@ -12,7 +12,7 @@ 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.ResultBean; +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.pdm.ivt.service.HotPointIvtService; @@ -21,6 +21,7 @@ import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.util.HashMap; import java.util.List; import java.util.Map; @@ -36,9 +37,17 @@ public class HotPointIvtServiceImpl implements HotPointIvtService { @Override public Map queryAll(Map whereJson, Pageable page){ - WQLObject wo = WQLObject.getWQLObject("st_ivt_hotpointivt"); - ResultBean rb = wo.pagequery(WqlUtil.getHttpContext(page), "1=1", "update_time desc"); - final JSONObject json = rb.pageResult(); + HashMap map = new HashMap(); + map.put("flag", "1"); + if (whereJson.get("point_code")!=null) + map.put("point_code", "%" + whereJson.get("point_code") + "%"); + map.put("point_status", whereJson.get("point_status")); + map.put("product_area", whereJson.get("product_area")); + map.put("is_used", whereJson.get("is_used")); + map.put("begin_time", whereJson.get("begin_time")); + map.put("end_time", whereJson.get("end_time")); + + JSONObject json = WQL.getWO("ST_IVT_HOTPOINTIVT").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "update_time desc"); return json; } diff --git a/nladmin-system/src/main/java/org/nl/wms/pdm/wql/ST_IVT_COOLPOINTIVT.wql b/nladmin-system/src/main/java/org/nl/wms/pdm/wql/ST_IVT_COOLPOINTIVT.wql index d3356af1b..ab24157b3 100644 --- a/nladmin-system/src/main/java/org/nl/wms/pdm/wql/ST_IVT_COOLPOINTIVT.wql +++ b/nladmin-system/src/main/java/org/nl/wms/pdm/wql/ST_IVT_COOLPOINTIVT.wql @@ -76,9 +76,9 @@ is_used = 输入.is_used ENDOPTION OPTION 输入.begin_time <> "" - instorage_time => 输入.begin_time + instorage_time >= 输入.begin_time ENDOPTION - OPTION 输入.end_tiem <> "" + OPTION 输入.end_time <> "" instorage_time <= 输入.end_time ENDOPTION ENDSELECT diff --git a/nladmin-system/src/main/java/org/nl/wms/pdm/wql/ST_IVT_HOTPOINTIVT.wql b/nladmin-system/src/main/java/org/nl/wms/pdm/wql/ST_IVT_HOTPOINTIVT.wql new file mode 100644 index 000000000..89bf9e09f --- /dev/null +++ b/nladmin-system/src/main/java/org/nl/wms/pdm/wql/ST_IVT_HOTPOINTIVT.wql @@ -0,0 +1,74 @@ +[交易说明] + 交易名： 烘烤区点位库存 + 所属模块： + 功能简述： + 版权所有： + 表引用： + 版本经历： + +[数据库] + --指定数据库，为空采用默认值，默认为db.properties中列出的第一个库 + +[IO定义] + ################################################# + ## 表字段对应输入参数 + ################################################# + 输入.flag TYPEAS s_string + 输入.point_code TYPEAS s_string + 输入.point_status TYPEAS s_string + 输入.product_area TYPEAS s_string + 输入.is_used TYPEAS s_string + 输入.begin_time TYPEAS s_string + 输入.end_time TYPEAS s_string + + +[临时表] + --这边列出来的临时表就会在运行期动态创建 + +[临时变量] + --所有中间过程变量均可在此处定义 + +[业务过程] + + ########################################## + # 1、输入输出检查 # + ########################################## + + + ########################################## + # 2、主过程前处理 # + ########################################## + + + ########################################## + # 3、业务主过程 # + ########################################## + IF 输入.flag = "1" + PAGEQUERY + SELECT + hot.* + FROM + st_ivt_hotpointivt hot + WHERE + 1=1 + OPTION 输入.point_code <> "" + point_code LIKE 输入.point_code + ENDOPTION + OPTION 输入.point_status <> "" + point_status = 输入.point_status + ENDOPTION + OPTION 输入.product_area <> "" + product_area = 输入.product_area + ENDOPTION + OPTION 输入.is_used <> "" + is_used = 输入.is_used + ENDOPTION + OPTION 输入.begin_time <> "" + instorage_time >= 输入.begin_time + ENDOPTION + OPTION 输入.end_time <> "" + instorage_time <= 输入.end_time + ENDOPTION + ENDSELECT + ENDPAGEQUERY + ENDIF \ No newline at end of file diff --git a/nladmin-ui/src/views/wms/pdm/ivt/hotpointivt/index.vue b/nladmin-ui/src/views/wms/pdm/ivt/hotpointivt/index.vue index 19ebc4e4d..da964c872 100644 --- a/nladmin-ui/src/views/wms/pdm/ivt/hotpointivt/index.vue +++ b/nladmin-ui/src/views/wms/pdm/ivt/hotpointivt/index.vue @@ -2,52 +2,117 @@
+
+ + + + + + + + + + + + + + + + + + + + + + + +
- - + + - + - + + + - - - - + - - - - - - - - - - + - - - - - - - - - - - - - +
@@ -59,17 +124,33 @@ - - + + + + + + - + - + + + - + + + @@ -77,6 +158,7 @@ @@ -99,9 +181,23 @@ const defaultForm = { ivt_id: null, point_code: null, point_status: null, contai export default { name: 'HotPointIvt', components: { pagination, crudOperation, rrOperation, udOperation }, + dicts: ['sch_point_status', 'product_area', 'is_used', 'point_location'], mixins: [presenter(), header(), form(defaultForm), crud()], cruds() { - return CRUD({ title: '烘烤区点位库存', url: 'api/hotpointivt', idField: 'ivt_id', sort: 'ivt_id,desc', crudMethod: { ...crudHotpointivt }}) + return CRUD({ + title: '烘烤区点位库存', + url: 'api/hotpointivt', + idField: 'ivt_id', + sort: 'ivt_id,desc', + crudMethod: { ...crudHotpointivt }, + optShow: { + add: false, + edit: true, + del: false, + download: false, + reset: true + } + }) }, data() { return { @@ -113,15 +209,6 @@ export default { ], point_status: [ { required: true, message: '点位状态不能为空', trigger: 'blur' } - ], - ivt_qty: [ - { required: true, message: '库存数不能为空', trigger: 'blur' } - ], - sort_seq: [ - { required: true, message: '顺序号不能为空', trigger: 'blur' } - ], - is_used: [ - { required: true, message: '是否启用不能为空', trigger: 'blur' } ] }} }, @@ -129,6 +216,9 @@ export default { // 钩子：在获取表格数据之前执行，false 则代表不获取数据 [CRUD.HOOK.beforeRefresh]() { return true + }, + hand(value) { + this.crud.toQuery() } } }