diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/eum/BusinessCodeEnum.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/eum/BusinessCodeEnum.java deleted file mode 100644 index 02a13c814..000000000 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/eum/BusinessCodeEnum.java +++ /dev/null @@ -1,27 +0,0 @@ -package org.nl.wms.basedata.master.eum; - -public enum BusinessCodeEnum { - STOCK_IN(1,"10","入库"), - STOCK_OUT(2,"20","出库"), - QUALITY_INSPECTOR(3,"30","质检"), - CHEMISTRY(4,"40","理化"); - - - private int index; - private String name; - private String code; - - private BusinessCodeEnum(int index, String code, String name) { - this.index = index; - this.code = code; - this.name = name; - } - - public String getName() { - return name; - } - - public String getCode() { - return code; - } -} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/eum/RecordStatusEnum.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/eum/RecordStatusEnum.java deleted file mode 100644 index bedc36a75..000000000 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/eum/RecordStatusEnum.java +++ /dev/null @@ -1,28 +0,0 @@ -package org.nl.wms.basedata.master.eum; - -public enum RecordStatusEnum { - CREATE(1,"01","生成"), - SET_TRAY(2,"02","组盘"), - STOCK_IN(3,"03","入库"), - STOCK_OUT(4,"04","出库"), - STOCK_STATE_IN(5,"05","入立库"); - - - private int index; - private String name; - private String code; - - private RecordStatusEnum(int index, String code, String name) { - this.index = index; - this.code = code; - this.name = name; - } - - public String getName() { - return name; - } - - public String getCode() { - return code; - } -} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/manage/AbstructMaterialType.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/manage/AbstructMaterialType.java deleted file mode 100644 index 83f07f1c8..000000000 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/manage/AbstructMaterialType.java +++ /dev/null @@ -1,8 +0,0 @@ -package org.nl.wms.basedata.master.manage; - -import java.util.HashSet; -import java.util.Set; - -public class AbstructMaterialType { - private Set materialTypeIds = new HashSet<>(); -} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/dto/InterfacebackDto.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/dto/InterfacebackDto.java index 67b42e470..5f93ea72c 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/dto/InterfacebackDto.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/dto/InterfacebackDto.java @@ -46,4 +46,9 @@ public class InterfacebackDto implements Serializable { * 业务说明 */ private String business_comment; + + /** + * 业务说明 + */ + private String[] product_area; } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/InterfacebackServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/InterfacebackServiceImpl.java index 65c5e3947..ecd99f73a 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/InterfacebackServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/InterfacebackServiceImpl.java @@ -3,6 +3,7 @@ package org.nl.wms.basedata.master.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; @@ -44,10 +45,23 @@ public class InterfacebackServiceImpl implements InterfacebackService { JSONObject map = new JSONObject(); map.put("flag", "1"); - if (ObjectUtil.isNotEmpty(interface_name)) map.put("interface_name","%"+interface_name+"%"); + if (ObjectUtil.isNotEmpty(interface_name)) map.put("interface_name", "%" + interface_name + "%"); JSONObject json = WQL.getWO("QMD_PB_INTERFACEBACK").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "interface_type ASC"); + JSONArray rows = json.getJSONArray("content"); + JSONArray content = new JSONArray(); + for (int i = 0; i < rows.size(); i++) { + JSONObject row = rows.getJSONObject(i); + String product_area = row.getString("product_area"); + if (StrUtil.isNotEmpty(product_area)){ + product_area = (product_area.replace("[","").replace("]","")).replaceAll("\\\"",""); + String[] areas = product_area.split(","); + row.put("product_area",areas); + } + content.add(row); + } + json.put("content",content); return json; } @@ -63,6 +77,12 @@ public class InterfacebackServiceImpl implements InterfacebackService { public InterfacebackDto findById(Long interface_id) { WQLObject wo = WQLObject.getWQLObject("md_pb_interfaceback"); JSONObject json = wo.query("interface_id = '" + interface_id + "'").uniqueResult(0); + String product_area = json.getString("product_area"); + if (StrUtil.isNotEmpty(product_area)){ + product_area = (product_area.replace("[","").replace("]","")).replaceAll("\\\"",""); + String[] areas = product_area.split(","); + json.put("product_area",areas); + } if (ObjectUtil.isNotEmpty(json)) { return json.toJavaObject(InterfacebackDto.class); } @@ -105,7 +125,7 @@ public class InterfacebackServiceImpl implements InterfacebackService { public void deleteAll(Long[] ids) { WQLObject wo = WQLObject.getWQLObject("md_pb_interfaceback"); for (Long interface_id : ids) { - wo.delete("interface_id = '"+interface_id+"'"); + wo.delete("interface_id = '" + interface_id + "'"); } } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/mdpb.xls b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/mdpb.xls index 1d5574a84..08cc99c27 100644 Binary files a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/mdpb.xls and b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/mdpb.xls differ diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/rest/StructivtController.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/rest/StructivtController.java index c85117957..b1a85b289 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/rest/StructivtController.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/rest/StructivtController.java @@ -37,8 +37,8 @@ public class StructivtController { @Log("查询库存管理") @ApiOperation("查询库存管理") //@PreAuthorize("@el.check('structivt:list')") - public ResponseEntity query(@RequestParam Map whereJson, Pageable page){ - return new ResponseEntity<>(structivtService.queryAll(whereJson,page),HttpStatus.OK); + public ResponseEntity query(@RequestParam Map whereJson, Pageable page,String[] product_area){ + return new ResponseEntity<>(structivtService.queryAll(whereJson,page,product_area),HttpStatus.OK); } @PostMapping @@ -95,8 +95,8 @@ public class StructivtController { @Log("导出数据") @ApiOperation("导出数据") @GetMapping(value = "/download") - public void download(@RequestParam Map map, HttpServletResponse response) throws IOException { - structivtService.download(map, response); + public void download(@RequestParam Map map, HttpServletResponse response ,String[] product_area) throws IOException { + structivtService.download(map, response, product_area); } } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/rest/UserAreaController.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/rest/UserAreaController.java new file mode 100644 index 000000000..2e4365494 --- /dev/null +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/rest/UserAreaController.java @@ -0,0 +1,47 @@ +package org.nl.wms.basedata.st.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.basedata.st.service.UserAreaService; +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/userArea") +@Slf4j +public class UserAreaController { + private final UserAreaService userAreaService; + + @GetMapping + @Log("查询用户信息") + @ApiOperation("查询用户信息") + public ResponseEntity query(@RequestParam Map whereJson, Pageable page) { + return new ResponseEntity<>(userAreaService.pageQuery(whereJson, page), HttpStatus.OK); + } + + @PostMapping("/queryUserArea") + @Log("查询用户对应区域") + @ApiOperation("查询用户对应区域") + public ResponseEntity queryUserArea(@RequestBody JSONObject whereJson) { + return new ResponseEntity<>(userAreaService.queryUserArea(whereJson),HttpStatus.OK); + } + + @PostMapping("/save") + @Log("保存用户仓库信息") + @ApiOperation("保存用户仓库信息") + public ResponseEntity save(@RequestBody JSONObject whereJson) { + userAreaService.save(whereJson); + return new ResponseEntity<>(HttpStatus.OK); + } + +} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/StructivtService.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/StructivtService.java index 7664d7622..3b27d0f9a 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/StructivtService.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/StructivtService.java @@ -24,7 +24,7 @@ public interface StructivtService { * @param page 分页参数 * @return Map */ - Map queryAll(Map whereJson, Pageable page); + Map queryAll(Map whereJson, Pageable page, String[] product_area); /** * 查询所有数据不分页 @@ -72,5 +72,5 @@ public interface StructivtService { JSONArray getUnits(); - void download(Map map, HttpServletResponse response) throws IOException; + void download(Map map, HttpServletResponse response,String[] product_area) throws IOException; } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/UserAreaService.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/UserAreaService.java new file mode 100644 index 000000000..916a2da38 --- /dev/null +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/UserAreaService.java @@ -0,0 +1,31 @@ +package org.nl.wms.basedata.st.service; + +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; +import org.springframework.data.domain.Pageable; + +import java.util.Map; + +public interface UserAreaService { + /** + * 查询数据分页 + * + * @param whereJson 条件 + * @param page 分页参数 + * @return Map + */ + Map pageQuery(Map whereJson, Pageable page); + + /** + * 查询用户对应仓库 + * @param whereJson / + */ + JSONArray queryUserArea(JSONObject whereJson); + + /** + * 保存 + * @param whereJson / + */ + void save(JSONObject whereJson); + +} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/StructivtServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/StructivtServiceImpl.java index c0595b3f3..f2dcf5279 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/StructivtServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/StructivtServiceImpl.java @@ -33,10 +33,10 @@ import java.util.List; import java.util.Map; /** -* @description 服务实现 -* @author geng by -* @date 2022-06-02 -**/ + * @author geng by + * @description 服务实现 + * @date 2022-06-02 + **/ @Service @RequiredArgsConstructor @Slf4j @@ -44,7 +44,7 @@ public class StructivtServiceImpl implements StructivtService { private final ClassstandardService classstandardService; @Override - public Map queryAll(Map whereJson, Pageable page){ + public Map queryAll(Map whereJson, Pageable page, String[] product_area) { String material = MapUtil.getStr(whereJson, "material"); String struct = MapUtil.getStr(whereJson, "struct"); String stor_id = MapUtil.getStr(whereJson, "stor_id"); @@ -54,11 +54,13 @@ public class StructivtServiceImpl implements StructivtService { String package_box_sn = MapUtil.getStr(whereJson, "package_box_sn"); String sale_order_name = MapUtil.getStr(whereJson, "sale_order_name"); String ivt_status = MapUtil.getStr(whereJson, "ivt_status"); + String is_virtual = MapUtil.getStr(whereJson, "is_virtual"); JSONObject map = new JSONObject(); map.put("flag", "1"); map.put("stor_id", stor_id); map.put("sect_id", sect_id); map.put("ivt_status", ivt_status); + map.put("is_virtual", is_virtual); if (StrUtil.isNotEmpty(material)) { map.put("material", "%" + material + "%"); } @@ -77,40 +79,51 @@ public class StructivtServiceImpl implements StructivtService { if (StrUtil.isNotEmpty(sale_order_name)) { map.put("sale_order_name", "%" + sale_order_name + "%"); } + if (ObjectUtil.isNotEmpty(product_area)) { + String areas = "("; + for (int i = 0; i < product_area.length; i++) { + if (i != product_area.length - 1) { + areas += "'"+product_area[i]+"',"; + } else { + areas += "'"+product_area[i]+"')"; + } + } + map.put("areas", areas); + } //获取人员对应的仓库 UserStorServiceImpl userStorService = new UserStorServiceImpl(); String in_stor_id = userStorService.getInStor(); - if (ObjectUtil.isNotEmpty(in_stor_id)) map.put("in_stor_id",in_stor_id); + if (ObjectUtil.isNotEmpty(in_stor_id)) map.put("in_stor_id", in_stor_id); JSONObject jsonObject = WQL.getWO("QST_STRUCTIVT001").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "ivt.instorage_time desc"); return jsonObject; } @Override - public List queryAll(Map whereJson){ - WQLObject wo = WQLObject.getWQLObject("st_ivt_structivt"); - JSONArray arr = wo.query().getResultJSONArray(0); - if (ObjectUtil.isNotEmpty(arr)) return arr.toJavaList(StructivtDto.class); - return null; + public List queryAll(Map whereJson) { + WQLObject wo = WQLObject.getWQLObject("st_ivt_structivt"); + JSONArray arr = wo.query().getResultJSONArray(0); + if (ObjectUtil.isNotEmpty(arr)) return arr.toJavaList(StructivtDto.class); + return null; } @Override public StructivtDto findById(Long stockrecord_id) { WQLObject wo = WQLObject.getWQLObject("st_ivt_structivt"); JSONObject json = wo.query("stockrecord_id = '" + stockrecord_id + "'").uniqueResult(0); - if (ObjectUtil.isNotEmpty(json)){ - return json.toJavaObject( StructivtDto.class); + if (ObjectUtil.isNotEmpty(json)) { + return json.toJavaObject(StructivtDto.class); } return null; } @Override - public StructivtDto findByCode(String code) { + public StructivtDto findByCode(String code) { WQLObject wo = WQLObject.getWQLObject("st_ivt_structivt"); JSONObject json = wo.query("code ='" + code + "'").uniqueResult(0); - if (ObjectUtil.isNotEmpty(json)){ - return json.toJavaObject( StructivtDto.class); + if (ObjectUtil.isNotEmpty(json)) { + return json.toJavaObject(StructivtDto.class); } return null; } @@ -144,7 +157,7 @@ public class StructivtServiceImpl implements StructivtService { String now = DateUtil.now(); WQLObject wo = WQLObject.getWQLObject("st_ivt_structivt"); - for (Long stockrecord_id: ids) { + for (Long stockrecord_id : ids) { JSONObject param = new JSONObject(); param.put("stockrecord_id", String.valueOf(stockrecord_id)); param.put("is_delete", "1"); @@ -177,7 +190,7 @@ public class StructivtServiceImpl implements StructivtService { } @Override - public void download(Map whereJson, HttpServletResponse response) throws IOException { + public void download(Map whereJson, HttpServletResponse response,String[] product_area) throws IOException { String material = MapUtil.getStr(whereJson, "material"); String struct = MapUtil.getStr(whereJson, "struct"); String stor_id = MapUtil.getStr(whereJson, "stor_id"); @@ -185,9 +198,11 @@ public class StructivtServiceImpl implements StructivtService { String sap_pcsn = MapUtil.getStr(whereJson, "sap_pcsn"); String package_box_sn = MapUtil.getStr(whereJson, "package_box_sn"); String sale_order_name = MapUtil.getStr(whereJson, "sale_order_name"); + String is_virtual = MapUtil.getStr(whereJson, "is_virtual"); JSONObject map = new JSONObject(); map.put("flag", "2"); map.put("stor_id", stor_id); + map.put("is_virtual", is_virtual); if (StrUtil.isNotEmpty(material)) { map.put("material", "%" + material + "%"); } @@ -207,11 +222,22 @@ public class StructivtServiceImpl implements StructivtService { map.put("sale_order_name", "%" + sale_order_name + "%"); } + if (ObjectUtil.isNotEmpty(product_area)) { + String areas = "("; + for (int i = 0; i < product_area.length; i++) { + if (i != product_area.length - 1) { + areas += "'"+product_area[i]+"',"; + } else { + areas += "'"+product_area[i]+"')"; + } + } + map.put("areas", areas); + } //获取人员对应的仓库 UserStorServiceImpl userStorService = new UserStorServiceImpl(); String in_stor_id = userStorService.getInStor(); - if (ObjectUtil.isNotEmpty(in_stor_id)) map.put("in_stor_id",in_stor_id); + if (ObjectUtil.isNotEmpty(in_stor_id)) map.put("in_stor_id", in_stor_id); JSONArray resultJSONArray = WQL.getWO("QST_STRUCTIVT001").addParamMap(map).process().getResultJSONArray(0); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/UserAreaServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/UserAreaServiceImpl.java new file mode 100644 index 000000000..b7267fe68 --- /dev/null +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/UserAreaServiceImpl.java @@ -0,0 +1,101 @@ +package org.nl.wms.basedata.st.service.impl; + +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.common.utils.SecurityUtils; +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.basedata.st.service.UserAreaService; +import org.nl.wms.basedata.st.service.UserStorService; +import org.springframework.data.domain.Pageable; +import org.springframework.stereotype.Service; + +import java.util.HashMap; +import java.util.Map; + +/** + * PC端出入库新增 + */ +@Service +@RequiredArgsConstructor +@Slf4j +public class UserAreaServiceImpl implements UserAreaService { + + @Override + public Map pageQuery(Map whereJson, Pageable page) { + HashMap map = new HashMap<>(whereJson); + map.put("flag", "3"); + if (StrUtil.isNotEmpty(map.get("blurry"))) { + map.put("blurry", "%" + map.get("blurry") + "%"); + } + JSONObject jo = WQL.getWO("QST_STOR_ATTR").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "username desc"); + return jo; + } + + @Override + public JSONArray queryUserArea(JSONObject whereJson) { + String user_id = whereJson.getString("user_id"); + JSONArray rows = WQLObject.getWQLObject("st_ivt_userarea").query("user_id = '" + user_id + "'").getResultJSONArray(0); + return rows; + } + + @Override + public void save(JSONObject whereJson) { + JSONObject jo = whereJson.getJSONObject("jo"); + JSONArray rows = whereJson.getJSONArray("rows"); + + String user_id = jo.getString("user_id"); + + WQLObject.getWQLObject("st_ivt_userarea").delete("user_id ='" + user_id + "'"); + for (int i = 0; i < rows.size(); i++) { + JSONObject row = rows.getJSONObject(i); + String product_area = row.getString("product_area"); + JSONObject user_stor = new JSONObject(); + user_stor.put("product_area", product_area); + user_stor.put("user_id", user_id); + WQLObject.getWQLObject("st_ivt_userarea").insert(user_stor); + } + } + + public String getInArea() { + String currentUserId = SecurityUtils.getCurrentUserId().toString(); + WQLObject userStorTab = WQLObject.getWQLObject("st_ivt_userarea"); + + JSONArray userStorArr = userStorTab.query("user_id = '" + currentUserId + "'").getResultJSONArray(0); + int size = userStorArr.size(); + // 将仓库id拼成字符串 + String in_stor_id = ""; + + for (int i = 0; i < userStorArr.size(); i++) { + JSONObject json = userStorArr.getJSONObject(i); + + if (size == 1) { + // 如果只有一条记录 + in_stor_id = "('"+json.getString("product_area")+"')"; + } else { + if (i == 0) { + // 第一条记录拼接 + in_stor_id = "('"+ json.getString("product_area")+ "','"; + } else { + if ((size -1 ) == i) { + // 最后一条记录拼接 + in_stor_id += json.getString("product_area") + "')"; + } else { + in_stor_id += json.getString("product_area") + "','"; + } + } + } + } + + if (ObjectUtil.isEmpty(in_stor_id)) { + in_stor_id = "('')"; + } + return in_stor_id; + } + +} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/QST_STRUCTIVT001.wql b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/QST_STRUCTIVT001.wql index 6b6d3f345..2e7c64937 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/QST_STRUCTIVT001.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/QST_STRUCTIVT001.wql @@ -14,6 +14,7 @@ ## 表字段对应输入参数 ################################################# 输入.flag TYPEAS s_string + 输入.areas TYPEAS f_string 输入.struct TYPEAS s_string 输入.material TYPEAS s_string 输入.stor_id TYPEAS s_string @@ -23,6 +24,7 @@ 输入.ivt_status TYPEAS s_string 输入.sale_order_name TYPEAS s_string 输入.package_box_sn TYPEAS s_string + 输入.is_virtual TYPEAS s_string 输入.in_stor_id TYPEAS f_string [临时表] @@ -65,6 +67,7 @@ FROM ST_IVT_StructIvt ivt LEFT JOIN st_ivt_structattr attr ON ivt.struct_id = attr.struct_id + LEFT JOIN st_ivt_sectattr sect ON sect.sect_id =attr.sect_id LEFT JOIN md_me_materialbase mater ON mater.material_id = ivt.material_id LEFT JOIN md_pb_measureunit unit ON unit.measure_unit_id = ivt.qty_unit_id LEFT JOIN SCH_BASE_Region region ON region.region_id = ivt.region_id @@ -79,6 +82,9 @@ ivt.struct_name like 输入.struct ) ENDOPTION + OPTION 输入.areas <> "" + LEFT(sub.container_name,2) IN 输入.areas + ENDOPTION OPTION 输入.material <> "" ( mater.material_code like 输入.material or @@ -88,6 +94,12 @@ OPTION 输入.pcsn <> "" ivt.pcsn like 输入.pcsn ENDOPTION + OPTION 输入.is_virtual = "0" + sect.sect_type_attr <> '09' + ENDOPTION + OPTION 输入.is_virtual = "1" + sect.sect_type_attr = '09' + ENDOPTION OPTION 输入.sap_pcsn <> "" sub.sap_pcsn like 输入.sap_pcsn @@ -160,6 +172,7 @@ FROM ST_IVT_StructIvt ivt LEFT JOIN st_ivt_structattr attr ON ivt.struct_id = attr.struct_id + LEFT JOIN st_ivt_sectattr sect ON sect.sect_id =attr.sect_id LEFT JOIN md_me_materialbase mater ON mater.material_id = ivt.material_id LEFT JOIN md_pb_measureunit unit ON unit.measure_unit_id = ivt.qty_unit_id LEFT JOIN SCH_BASE_Region region ON region.region_id = ivt.region_id @@ -192,6 +205,12 @@ attr.stor_id = 输入.stor_id ENDOPTION + OPTION 输入.is_virtual = "0" + sect.sect_type_attr <> '09' + ENDOPTION + OPTION 输入.is_virtual = "1" + sect.sect_type_attr = '09' + ENDOPTION OPTION 输入.package_box_sn <> "" sub.package_box_sn like 输入.package_box_sn ENDOPTION @@ -199,7 +218,9 @@ OPTION 输入.sale_order_name <> "" sub.sale_order_name like 输入.sale_order_name ENDOPTION - + OPTION 输入.areas <> "" + LEFT(sub.container_name,2) IN 输入.areas + ENDOPTION ENDSELECT ENDQUERY ENDIF diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/common/StructFindUtil.java b/lms/nladmin-system/src/main/java/org/nl/wms/common/StructFindUtil.java deleted file mode 100644 index 16e42d94a..000000000 --- a/lms/nladmin-system/src/main/java/org/nl/wms/common/StructFindUtil.java +++ /dev/null @@ -1,91 +0,0 @@ -package org.nl.wms.common; - -import cn.hutool.core.util.ObjectUtil; -import cn.hutool.core.util.StrUtil; -import com.alibaba.fastjson.JSONObject; -import org.nl.modules.common.exception.BadRequestException; -import org.nl.modules.wql.WQL; -import org.nl.modules.wql.core.bean.WQLObject; - -public class StructFindUtil { - public static JSONObject getInStruct(JSONObject jsonObject) { - String material_id = jsonObject.getString("material_id"); - String area_type = jsonObject.getString("area_type"); - String vehicle_code = jsonObject.getString("vehicle_code"); - if (StrUtil.isEmpty(vehicle_code)) { - throw new BadRequestException("托盘不能为空！"); - } - //根据托盘找托盘类型， - JSONObject vehicleObj = WQLObject.getWQLObject("md_pb_vehicle").query("vehicle_code='" + vehicle_code + "'").uniqueResult(0); - if (ObjectUtil.isEmpty(vehicleObj)) { - throw new BadRequestException("未找到托盘号为'" + vehicle_code + "' 托盘信息！"); - } - if (StrUtil.isEmpty(material_id)) { - throw new BadRequestException("物料不能为空！"); - } - if (StrUtil.isEmpty(area_type)) { - throw new BadRequestException("区域不能为空！"); - } - String vehice_type = vehicleObj.getString("vehicle_type"); - JSONObject result = WQL.getWO("QSTRUCT_RULE").addParam("flag", "2") - .addParam("material_id", material_id).addParam("area_type", area_type).addParam("vehice_type", vehice_type).process().uniqueResult(0); - return result; - } - - public static JSONObject getOutStruct(JSONObject jsonObject) { - String material_id = jsonObject.getString("material_id"); - String area_type = jsonObject.getString("area_type"); - String is_full = jsonObject.getString("is_full"); - String workprocedure_id = jsonObject.getString("workprocedure_id"); - - if (StrUtil.isEmpty(material_id)) { - throw new BadRequestException("物料不能为空！"); - } - if (StrUtil.isEmpty(area_type)) { - throw new BadRequestException("区域不能为空！"); - } - if (StrUtil.isEmpty(is_full)) { - throw new BadRequestException("是否满托不能为空！"); - } - if (StrUtil.isEmpty(workprocedure_id)) { - throw new BadRequestException("工序不能为空！"); - } - JSONObject result = WQL.getWO("QSTRUCT_RULE").addParam("flag", "3") - .addParam("material_id", material_id).addParam("area_type", area_type) - .addParam("is_full", is_full).addParam("workprocedure_id", workprocedure_id) - .process().uniqueResult(0); - return result; - } - - public static JSONObject getEmptyVehicleInStruct(JSONObject jsonObject) { - String area_type = jsonObject.getString("area_type"); - String vehicle_code = jsonObject.getString("vehicle_code"); - if (StrUtil.isEmpty(vehicle_code)) { - throw new BadRequestException("托盘不能为空！"); - } - //根据托盘找托盘类型， - JSONObject vehicleObj = WQLObject.getWQLObject("md_pb_vehicle").query("vehicle_code='" + vehicle_code + "'").uniqueResult(0); - if (ObjectUtil.isEmpty(vehicleObj)) { - throw new BadRequestException("未找到托盘号为'" + vehicle_code + "' 托盘信息！"); - } - if (StrUtil.isEmpty(area_type)) { - throw new BadRequestException("区域不能为空！"); - } - String vehice_type = vehicleObj.getString("vehicle_type"); - JSONObject result = WQL.getWO("QSTRUCT_RULE").addParam("flag", "4") - .addParam("area_type", area_type).addParam("vehice_type", vehice_type).process().uniqueResult(0); - return result; - } - - public static JSONObject getEmptyVehicleOutStruct(JSONObject jsonObject) { - String area_type = jsonObject.getString("area_type"); - String vehicle_type = jsonObject.getString("vehicle_type"); - if (StrUtil.isEmpty(area_type)) { - throw new BadRequestException("区域不能为空！"); - } - JSONObject result = WQL.getWO("QSTRUCT_RULE").addParam("flag", "5") - .addParam("area_type", area_type).addParam("vehicle_type", vehicle_type).process().uniqueResult(0); - return result; - } - -} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/2.txt b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/2.txt deleted file mode 100644 index e69de29bb..000000000 diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/mps/rest/PersoncorrdeviceController.java b/lms/nladmin-system/src/main/java/org/nl/wms/mps/rest/PersoncorrdeviceController.java deleted file mode 100644 index d461d4443..000000000 --- a/lms/nladmin-system/src/main/java/org/nl/wms/mps/rest/PersoncorrdeviceController.java +++ /dev/null @@ -1,120 +0,0 @@ - -package org.nl.wms.mps.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.mps.service.PersoncorrdeviceService; -import org.nl.wms.mps.service.dto.PersoncorrdeviceDto; -import org.springframework.data.domain.Pageable; -import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - -import java.util.Map; - -/** -* @author geng by -* @date 2022-05-26 -**/ -@RestController -@RequiredArgsConstructor -@Api(tags = "人员设备维护管理") -@RequestMapping("/api/personcorrdevice") -@Slf4j -public class PersoncorrdeviceController { - - private final PersoncorrdeviceService personcorrdeviceService; - - @GetMapping - @Log("查询人员设备维护") - @ApiOperation("查询人员设备维护") - //@PreAuthorize("@el.check('personcorrdevice:list')") - public ResponseEntity query(@RequestParam Map whereJson, Pageable page){ - return new ResponseEntity<>(personcorrdeviceService.queryAll(whereJson,page),HttpStatus.OK); - } - - @PostMapping - @Log("新增人员设备维护") - @ApiOperation("新增人员设备维护") - //@PreAuthorize("@el.check('personcorrdevice:add')") - public ResponseEntity create(@Validated @RequestBody PersoncorrdeviceDto dto){ - personcorrdeviceService.create(dto); - return new ResponseEntity<>(HttpStatus.CREATED); - } - - @PutMapping - @Log("修改人员设备维护") - @ApiOperation("修改人员设备维护") - //@PreAuthorize("@el.check('personcorrdevice:edit')") - public ResponseEntity update(@Validated @RequestBody PersoncorrdeviceDto dto){ - personcorrdeviceService.update(dto); - return new ResponseEntity<>(HttpStatus.NO_CONTENT); - } - - @Log("删除人员设备维护") - @ApiOperation("删除人员设备维护") - //@PreAuthorize("@el.check('personcorrdevice:del')") - @DeleteMapping - public ResponseEntity delete(@RequestBody Long[] ids) { - personcorrdeviceService.deleteAll(ids); - return new ResponseEntity<>(HttpStatus.OK); - } - - @PostMapping("/addPersons") - @Log("添加人员") - @ApiOperation("添加人员") - //@PreAuthorize("@el.check('teamcorrperson:list')") - public ResponseEntity addPersons(@RequestBody JSONObject param) { - personcorrdeviceService.addPersons(param); - return new ResponseEntity<>( HttpStatus.OK); - } - - @GetMapping("/getDeviceByPerson") - @Log("查询设备") - @ApiOperation("查询设备") - //@PreAuthorize("@el.check('personcorrdevice:list')") - public ResponseEntity getDeviceByPerson(@RequestParam Map whereJson, Pageable page){ - return new ResponseEntity<>(personcorrdeviceService.getDeviceByPerson(whereJson,page),HttpStatus.OK); - } - - @PostMapping("/getHeader") - @Log("查询表头") - @ApiOperation("查询表头") - //@PreAuthorize("@el.check('teamcorrperson:list')") - public ResponseEntity getHeader(@RequestBody JSONObject param) { - return new ResponseEntity<>( personcorrdeviceService.getHeader(param),HttpStatus.OK); - } - - @PostMapping("/getDeviceIdByUserId") - @Log("查询人员的设备") - @ApiOperation("查询人员的设备") - //@PreAuthorize("@el.check('teamcorrperson:list')") - public ResponseEntity getDeviceIdByUserId(@RequestBody JSONObject param) { - return new ResponseEntity<>( personcorrdeviceService.getDeviceIdByUserId(param),HttpStatus.OK); - } - - @PostMapping("/addDevices") - @Log("添加人员的设备") - @ApiOperation("添加人员的设备") - //@PreAuthorize("@el.check('teamcorrperson:list')") - public ResponseEntity addDevices(@RequestBody JSONObject param) { - personcorrdeviceService.addDevices(param); - return new ResponseEntity<>(HttpStatus.OK); - } - - @DeleteMapping("/deleteRow") - @Log("删除人员的设备") - @ApiOperation("删除人员的设备") - //@PreAuthorize("@el.check('teamcorrperson:list')") - public ResponseEntity deleteRow(@RequestBody JSONObject param) { - personcorrdeviceService.deleteRow(param); - return new ResponseEntity<>(HttpStatus.OK); - } - -} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/mps/rest/ProduceshiftorderController.java b/lms/nladmin-system/src/main/java/org/nl/wms/mps/rest/ProduceshiftorderController.java deleted file mode 100644 index 10d39face..000000000 --- a/lms/nladmin-system/src/main/java/org/nl/wms/mps/rest/ProduceshiftorderController.java +++ /dev/null @@ -1,145 +0,0 @@ -package org.nl.wms.mps.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.mps.service.ProduceshiftorderService; -import org.nl.wms.mps.service.dto.ProduceshiftorderDto; -import org.springframework.data.domain.Pageable; -import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - -import java.util.Map; - -/** -* @author qinx -* @date 2022-05-24 -**/ -@RestController -@RequiredArgsConstructor -@Api(tags = "工单管理") -@RequestMapping("/api/produceshiftorder") -@Slf4j -public class ProduceshiftorderController { - - private final ProduceshiftorderService produceshiftorderService; - - @GetMapping - @Log("查询工单") - @ApiOperation("查询工单") - //@PreAuthorize("@el.check('produceshiftorder:list')") - public ResponseEntity query(@RequestParam Map whereJson, Pageable page){ - return new ResponseEntity<>(produceshiftorderService.queryAll(whereJson,page),HttpStatus.OK); - } - - @PostMapping - @Log("新增工单") - @ApiOperation("新增工单") - //@PreAuthorize("@el.check('produceshiftorder:add')") - public ResponseEntity create(@Validated @RequestBody ProduceshiftorderDto dto){ - produceshiftorderService.create(dto); - return new ResponseEntity<>(HttpStatus.CREATED); - } - - @PutMapping - @Log("修改工单") - @ApiOperation("修改工单") - //@PreAuthorize("@el.check('produceshiftorder:edit')") - public ResponseEntity update(@Validated @RequestBody ProduceshiftorderDto dto){ - produceshiftorderService.update(dto); - return new ResponseEntity<>(HttpStatus.NO_CONTENT); - } - - @Log("删除工单") - @ApiOperation("删除工单") - //@PreAuthorize("@el.check('produceshiftorder:del')") - @DeleteMapping - public ResponseEntity delete(@RequestBody Long[] ids) { - produceshiftorderService.deleteAll(ids); - return new ResponseEntity<>(HttpStatus.OK); - } - - @PutMapping("/submits") - @Log("工单下发") - @ApiOperation("工单下发") - //@PreAuthorize("@el.check('produceshiftorder:edit')") - public ResponseEntity submits(@RequestBody JSONObject param){ - produceshiftorderService.submits(param); - return new ResponseEntity<>(HttpStatus.NO_CONTENT); - } - - @PostMapping("/getDevice") - @Log("根据登录用户设备下拉") - @ApiOperation("根据登录用户设备下拉") - //@PreAuthorize("@el.check('produceshiftorder:list')") - public ResponseEntity getDevice(@RequestBody JSONObject param){ - return new ResponseEntity<>(produceshiftorderService.getDevice(param),HttpStatus.OK); - } - - @PostMapping("/getTable") - @Log("获取工单生产记录") - @ApiOperation("获取工单生产记录") - //@PreAuthorize("@el.check('produceshiftorder:list')") - public ResponseEntity getTable(@RequestBody JSONObject param){ - return new ResponseEntity<>(produceshiftorderService.getTable(param),HttpStatus.OK); - } - - @PostMapping("/openStart") - @Log("看板开工") - @ApiOperation("看板开工") - //@PreAuthorize("@el.check('produceshiftorder:list')") - public ResponseEntity openStart(@RequestBody JSONObject param){ - produceshiftorderService.openStart(param); - return new ResponseEntity<>(HttpStatus.OK); - } - - @PostMapping("/saveReport") - @Log("看板报工") - @ApiOperation("看板报工") - //@PreAuthorize("@el.check('produceshiftorder:list')") - public ResponseEntity saveReport(@RequestBody JSONObject param){ - produceshiftorderService.saveReport(param); - return new ResponseEntity<>(HttpStatus.OK); - } - - @PostMapping("/finish") - @Log("看板强制完成") - @ApiOperation("看板强制完成") - //@PreAuthorize("@el.check('produceshiftorder:list')") - public ResponseEntity finish(@RequestBody JSONObject param){ - produceshiftorderService.finish(param); - return new ResponseEntity<>(HttpStatus.OK); - } - - @PostMapping("/getReportWork") - @Log("获取当前报工记录") - @ApiOperation("获取当前报工记录") - //@PreAuthorize("@el.check('produceshiftorder:list')") - public ResponseEntity getReportWork(@RequestBody JSONObject param){ - return new ResponseEntity<>(produceshiftorderService.getReportWork(param),HttpStatus.OK); - } - - @PostMapping("/forceFinish") - @Log("工单强制完成") - @ApiOperation("工单强制完成") - //@PreAuthorize("@el.check('produceshiftorder:list')") - public ResponseEntity forceFinish(@RequestBody JSONObject param){ - produceshiftorderService.forceFinish(param); - return new ResponseEntity<>(HttpStatus.OK); - } - - @PostMapping("/getDtl") - @Log("获取当前工单下的工单生产记录") - @ApiOperation("获取当前工单下的工单生产记录") - //@PreAuthorize("@el.check('produceshiftorder:list')") - public ResponseEntity getDtl(@RequestBody JSONObject param){ - return new ResponseEntity<>(produceshiftorderService.getDtl(param),HttpStatus.OK); - } - -} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/mps/rest/TeamcorrpersonController.java b/lms/nladmin-system/src/main/java/org/nl/wms/mps/rest/TeamcorrpersonController.java deleted file mode 100644 index 10f28cd8e..000000000 --- a/lms/nladmin-system/src/main/java/org/nl/wms/mps/rest/TeamcorrpersonController.java +++ /dev/null @@ -1,65 +0,0 @@ - -package org.nl.wms.mps.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.mps.service.TeamcorrpersonService; -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; - -/** -* @author geng by -* @date 2022-05-26 -**/ -@RestController -@RequiredArgsConstructor -@Api(tags = "班组人员维护管理") -@RequestMapping("/api/teamcorrperson") -@Slf4j -public class TeamcorrpersonController { - - private final TeamcorrpersonService teamcorrpersonService; - - @GetMapping - @Log("查询班组人员维护") - @ApiOperation("查询班组人员维护") - //@PreAuthorize("@el.check('teamcorrperson:list')") - public ResponseEntity query(@RequestParam Map whereJson, Pageable page) { - return new ResponseEntity<>(teamcorrpersonService.queryAll(whereJson, page), HttpStatus.OK); - } - - @PostMapping("/getPersonIdByTeamId") - @Log("根据班组查询人员id") - @ApiOperation("根据班组查询人员id") - //@PreAuthorize("@el.check('teamcorrperson:list')") - public ResponseEntity getPersonIdByTeamId(@RequestBody JSONObject param) { - return new ResponseEntity<>(teamcorrpersonService.getPersonIdByTeamId(param), HttpStatus.OK); - } - - @PostMapping("/addPersons") - @Log("添加班组人员关系") - @ApiOperation("添加班组人员关系") - //@PreAuthorize("@el.check('teamcorrperson:list')") - public ResponseEntity addPersons(@RequestBody JSONObject param) { - teamcorrpersonService.addPersons(param); - return new ResponseEntity<>( HttpStatus.OK); - } - - @Log("删除") - @ApiOperation("删除") - //@PreAuthorize("@el.check('workteam:del')") - @DeleteMapping - public ResponseEntity delete(@RequestBody Long[] ids) { - teamcorrpersonService.deleteAll(ids); - return new ResponseEntity<>(HttpStatus.OK); - } -} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/mps/rest/WorkteamController.java b/lms/nladmin-system/src/main/java/org/nl/wms/mps/rest/WorkteamController.java deleted file mode 100644 index 5a62c97b0..000000000 --- a/lms/nladmin-system/src/main/java/org/nl/wms/mps/rest/WorkteamController.java +++ /dev/null @@ -1,85 +0,0 @@ - -package org.nl.wms.mps.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.mps.service.WorkteamService; -import org.nl.wms.mps.service.dto.WorkteamDto; -import org.springframework.data.domain.Pageable; -import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - -import java.util.Map; - -/** -* @author geng by -* @date 2022-05-25 -**/ -@RestController -@RequiredArgsConstructor -@Api(tags = "班组管理") -@RequestMapping("/api/workteam") -@Slf4j -public class WorkteamController { - - private final WorkteamService workteamService; - - @GetMapping - @Log("查询班组") - @ApiOperation("查询班组") - //@PreAuthorize("@el.check('workteam:list')") - public ResponseEntity query(@RequestParam Map whereJson, Pageable page){ - return new ResponseEntity<>(workteamService.queryAll(whereJson,page),HttpStatus.OK); - } - - @PostMapping - @Log("新增班组") - @ApiOperation("新增班组") - //@PreAuthorize("@el.check('workteam:add')") - public ResponseEntity create(@Validated @RequestBody WorkteamDto dto){ - workteamService.create(dto); - return new ResponseEntity<>(HttpStatus.CREATED); - } - - @PutMapping - @Log("修改班组") - @ApiOperation("修改班组") - //@PreAuthorize("@el.check('workteam:edit')") - public ResponseEntity update(@Validated @RequestBody WorkteamDto dto){ - workteamService.update(dto); - return new ResponseEntity<>(HttpStatus.NO_CONTENT); - } - - @Log("删除班组") - @ApiOperation("删除班组") - //@PreAuthorize("@el.check('workteam:del')") - @DeleteMapping - public ResponseEntity delete(@RequestBody Long[] ids) { - workteamService.deleteAll(ids); - return new ResponseEntity<>(HttpStatus.OK); - } - - @GetMapping("/getClasssystem") - @Log("查询班制下拉") - @ApiOperation("查询班制下拉") - //@PreAuthorize("@el.check('workteam:list')") - public ResponseEntity getClasssystem(){ - return new ResponseEntity<>(workteamService.getClasssystem(),HttpStatus.OK); - } - - @PutMapping("/changeActive") - @Log("修改状态") - @ApiOperation("修改状态") - public ResponseEntity update(@RequestBody JSONObject json) { - workteamService.changeActive(json); - return new ResponseEntity<>(HttpStatus.NO_CONTENT); - } - -} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/mps/service/PersoncorrdeviceService.java b/lms/nladmin-system/src/main/java/org/nl/wms/mps/service/PersoncorrdeviceService.java deleted file mode 100644 index c8ad31c32..000000000 --- a/lms/nladmin-system/src/main/java/org/nl/wms/mps/service/PersoncorrdeviceService.java +++ /dev/null @@ -1,84 +0,0 @@ - -package org.nl.wms.mps.service; - -import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; -import org.nl.wms.mps.service.dto.PersoncorrdeviceDto; -import org.springframework.data.domain.Pageable; - -import java.util.List; -import java.util.Map; - -/** -* @description 服务接口 -* @author geng by -* @date 2022-05-26 -**/ -public interface PersoncorrdeviceService { - - /** - * 查询数据分页 - * @param whereJson 条件 - * @param page 分页参数 - * @return Map - */ - Map queryAll(Map whereJson, Pageable page); - - /** - * 查询所有数据不分页 - * @param whereJson 条件参数 - * @return List - */ - List queryAll(Map whereJson); - - /** - * 根据ID查询 - * @param team_person_device_id ID - * @return Personcorrdevice - */ - PersoncorrdeviceDto findById(Long team_person_device_id); - - /** - * 根据编码查询 - * @param code code - * @return Personcorrdevice - */ - PersoncorrdeviceDto findByCode(String code); - - - /** - * 创建 - * @param dto / - */ - void create(PersoncorrdeviceDto dto); - - /** - * 编辑 - * @param dto / - */ - void update(PersoncorrdeviceDto dto); - - /** - * 多选删除 - * @param ids / - */ - void deleteAll(Long[] ids); - - void addPersons(JSONObject param); - - /** - * 设备 - * @param whereJson 条件 - * @param page 分页参数 - * @return Map - */ - Map getDeviceByPerson(Map whereJson, Pageable page); - - Map getHeader(JSONObject param); - - JSONArray getDeviceIdByUserId(JSONObject param); - - void addDevices(JSONObject param); - - void deleteRow(JSONObject param); -} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/mps/service/ProduceshiftorderService.java b/lms/nladmin-system/src/main/java/org/nl/wms/mps/service/ProduceshiftorderService.java deleted file mode 100644 index ab70e94d2..000000000 --- a/lms/nladmin-system/src/main/java/org/nl/wms/mps/service/ProduceshiftorderService.java +++ /dev/null @@ -1,124 +0,0 @@ -package org.nl.wms.mps.service; - -import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; -import org.nl.wms.mps.service.dto.ProduceshiftorderDto; -import org.springframework.data.domain.Pageable; - -import java.util.List; -import java.util.Map; - -/** -* @description 服务接口 -* @author qinx -* @date 2022-05-24 -**/ -public interface ProduceshiftorderService { - - /** - * 查询数据分页 - * @param whereJson 条件 - * @param page 分页参数 - * @return Map - */ - Map queryAll(Map whereJson, Pageable page); - - /** - * 查询所有数据不分页 - * @param whereJson 条件参数 - * @return List - */ - List queryAll(Map whereJson); - - /** - * 根据ID查询 - * @param produceorder_id ID - * @return Produceshiftorder - */ - ProduceshiftorderDto findById(Long produceorder_id); - - /** - * 根据编码查询 - * @param code code - * @return Produceshiftorder - */ - ProduceshiftorderDto findByCode(String code); - - - /** - * 创建 - * @param dto / - */ - void create(ProduceshiftorderDto dto); - - /** - * 编辑 - * @param dto / - */ - void update(ProduceshiftorderDto dto); - - /** - * 多选删除 - * @param ids / - */ - void deleteAll(Long[] ids); - - /** - * 工单下发 - * @param param - */ - void submits(JSONObject param); - - /** - * 根据当前登录用户下拉 - * @param param - * @return - */ - JSONArray getDevice(JSONObject param); - - /** - * 获取工单生产记录 - * @param param - * @return - */ - JSONArray getTable(JSONObject param); - - /** - * 看板开工 - * @param param - */ - void openStart(JSONObject param); - - /** - * 看板报工 - * @param param - */ - void saveReport(JSONObject param); - - /** - * 看板强制完成 - * @param param - */ - void finish(JSONObject param); - - /** - * 获取当前报工记录 - * @param param - * @return - */ - JSONObject getReportWork(JSONObject param); - - - /** - * 工单强制完成 - * @param param - */ - void forceFinish(JSONObject param); - - /** - * 获取当前工单下的工单生产记录 - * @param param - * @return - */ - JSONArray getDtl(JSONObject param); -} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/mps/service/TeamcorrpersonService.java b/lms/nladmin-system/src/main/java/org/nl/wms/mps/service/TeamcorrpersonService.java deleted file mode 100644 index cfc13188f..000000000 --- a/lms/nladmin-system/src/main/java/org/nl/wms/mps/service/TeamcorrpersonService.java +++ /dev/null @@ -1,34 +0,0 @@ - -package org.nl.wms.mps.service; - -import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; -import org.springframework.data.domain.Pageable; - -import java.util.Map; - -/** -* @description 服务接口 -* @author geng by -* @date 2022-05-26 -**/ -public interface TeamcorrpersonService { - - /** - * 查询数据分页 - * @param whereJson 条件 - * @param page 分页参数 - * @return Map - */ - Map queryAll(Map whereJson, Pageable page); - - JSONArray getPersonIdByTeamId(JSONObject param); - - void addPersons(JSONObject param); - - /** - * 多选删除 - * @param ids / - */ - void deleteAll(Long[] ids); -} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/mps/service/WorkteamService.java b/lms/nladmin-system/src/main/java/org/nl/wms/mps/service/WorkteamService.java deleted file mode 100644 index 8e8c03cb5..000000000 --- a/lms/nladmin-system/src/main/java/org/nl/wms/mps/service/WorkteamService.java +++ /dev/null @@ -1,74 +0,0 @@ - -package org.nl.wms.mps.service; - -import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; -import org.nl.wms.mps.service.dto.WorkteamDto; -import org.springframework.data.domain.Pageable; - -import java.util.List; -import java.util.Map; - -/** -* @description 服务接口 -* @author geng by -* @date 2022-05-25 -**/ -public interface WorkteamService { - - /** - * 查询数据分页 - * @param whereJson 条件 - * @param page 分页参数 - * @return Map - */ - Map queryAll(Map whereJson, Pageable page); - - /** - * 查询所有数据不分页 - * @param whereJson 条件参数 - * @return List - */ - List queryAll(Map whereJson); - - /** - * 根据ID查询 - * @param team_id ID - * @return Workteam - */ - WorkteamDto findById(Long team_id); - - /** - * 根据编码查询 - * @param code code - * @return Workteam - */ - WorkteamDto findByCode(String code); - - - /** - * 创建 - * @param dto / - */ - void create(WorkteamDto dto); - - /** - * 编辑 - * @param dto / - */ - void update(WorkteamDto dto); - - /** - * 多选删除 - * @param ids / - */ - void deleteAll(Long[] ids); - - /** - * 班制下拉 - * @return - */ - JSONArray getClasssystem(); - - void changeActive(JSONObject json); -} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/mps/service/dto/PersoncorrdeviceDto.java b/lms/nladmin-system/src/main/java/org/nl/wms/mps/service/dto/PersoncorrdeviceDto.java deleted file mode 100644 index f3d97c9ce..000000000 --- a/lms/nladmin-system/src/main/java/org/nl/wms/mps/service/dto/PersoncorrdeviceDto.java +++ /dev/null @@ -1,27 +0,0 @@ -package org.nl.wms.mps.service.dto; - -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import lombok.Data; - -import java.io.Serializable; - -/** -* @description / -* @author geng by -* @date 2022-05-26 -**/ -@Data -public class PersoncorrdeviceDto implements Serializable { - - /** 班组人员设备对应标识 */ - /** 防止精度丢失 */ - @JsonSerialize(using= ToStringSerializer.class) - private Long team_person_device_id; - - /** 操作工标识 */ - private Long jockey_id; - - /** 设备标识 */ - private Long device_id; -} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/mps/service/dto/ProduceshiftorderDto.java b/lms/nladmin-system/src/main/java/org/nl/wms/mps/service/dto/ProduceshiftorderDto.java deleted file mode 100644 index 7a8892367..000000000 --- a/lms/nladmin-system/src/main/java/org/nl/wms/mps/service/dto/ProduceshiftorderDto.java +++ /dev/null @@ -1,159 +0,0 @@ -package org.nl.wms.mps.service.dto; - -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import lombok.Data; - -import java.io.Serializable; -import java.math.BigDecimal; - -/** - * @author qinx - * @description / - * @date 2022-05-24 - **/ -@Data -public class ProduceshiftorderDto implements Serializable { - - /** 生产班次工单标识 */ - /** - * 防止精度丢失 - */ - @JsonSerialize(using = ToStringSerializer.class) - private Long produceorder_id; - - /** - * 生产班次工单编号 - */ - private String produceorder_code; - - /** - * 机台工单号 - */ - private String producedeviceorder_code; - - /** - * 班次类型 - */ - private String shift_type_scode; - - /** - * 生产日期 - */ - private String produce_date; - - /** - * 计划数量 - */ - private BigDecimal plan_qty; - - /** - * 实际数量 - */ - private BigDecimal real_qty; - - /** - * 报工数量 - */ - private BigDecimal report_qty; - - /** - * 物料标识 - */ - private Long material_id; - - /** - * 物料单重 - */ - private BigDecimal material_weight; - - /** - * 托盘类型 - */ - private String vehicle_type; - - /** - * 计划生产开始时间 - */ - private String planproducestart_date; - - /** - * 计划生产结束时间 - */ - private String planproduceend_date; - - /** - * 实际生产开始时间 - */ - private String realproducestart_date; - - /** - * 实际生产结束时间 - */ - private String realproduceend_date; - - /** - * 工单状态 - */ - private String order_status; - - /** - * 是否搬运 - */ - private String is_needmove; - - /** - * 工单类型 - */ - private String order_type_scode; - - /** - * 创建人 - */ - private String create_id; - - /** - * 创建人姓名 - */ - private String create_name; - - /** - * 创建时间 - */ - private String create_time; - - /** - * 修改人 - */ - private String 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_canupdate_update; - - private Long device_id; - private Long sale_id; -} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/mps/service/dto/TeamcorrpersonDto.java b/lms/nladmin-system/src/main/java/org/nl/wms/mps/service/dto/TeamcorrpersonDto.java deleted file mode 100644 index e14fedd04..000000000 --- a/lms/nladmin-system/src/main/java/org/nl/wms/mps/service/dto/TeamcorrpersonDto.java +++ /dev/null @@ -1,27 +0,0 @@ -package org.nl.wms.mps.service.dto; - -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import lombok.Data; - -import java.io.Serializable; - -/** -* @description / -* @author geng by -* @date 2022-05-26 -**/ -@Data -public class TeamcorrpersonDto implements Serializable { - - /** 班组人员对应标识 */ - /** 防止精度丢失 */ - @JsonSerialize(using= ToStringSerializer.class) - private Long team_person_id; - - /** 班组标识 */ - private Long team_id; - - /** 操作工标识 */ - private Long jockey_id; -} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/mps/service/dto/WorkteamDto.java b/lms/nladmin-system/src/main/java/org/nl/wms/mps/service/dto/WorkteamDto.java deleted file mode 100644 index 5685ac0a8..000000000 --- a/lms/nladmin-system/src/main/java/org/nl/wms/mps/service/dto/WorkteamDto.java +++ /dev/null @@ -1,63 +0,0 @@ -package org.nl.wms.mps.service.dto; - -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import lombok.Data; - -import java.io.Serializable; - -/** -* @description / -* @author geng by -* @date 2022-05-25 -**/ -@Data -public class WorkteamDto implements Serializable { - - /** 班组标识 */ - /** 防止精度丢失 */ - @JsonSerialize(using= ToStringSerializer.class) - private Long team_id; - - /** 班组编码 */ - private String team_code; - - /** 班组名称 */ - private String team_name; - - /** 班制标识 */ - private Long classsystem_id; - - /** 备注 */ - private String remark; - - /** 是否启用 */ - private String is_active; - - /** 创建人 */ - private String create_id; - - /** 创建人姓名 */ - private String create_name; - - /** 创建时间 */ - private String create_time; - - /** 修改人 */ - private String update_optid; - - /** 修改人姓名 */ - private String update_optname; - - /** 修改时间 */ - private String update_time; - - /** 部门ID */ - private String sysdeptid; - - /** 公司ID */ - private String syscompanyid; - - /** 是否删除 */ - private String is_delete; -} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/mps/service/impl/PersoncorrdeviceServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/mps/service/impl/PersoncorrdeviceServiceImpl.java deleted file mode 100644 index 517fe8009..000000000 --- a/lms/nladmin-system/src/main/java/org/nl/wms/mps/service/impl/PersoncorrdeviceServiceImpl.java +++ /dev/null @@ -1,250 +0,0 @@ - -package org.nl.wms.mps.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.JSON; -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.common.utils.SecurityUtils; -import org.nl.wms.mps.service.PersoncorrdeviceService; -import org.nl.wms.mps.service.dto.PersoncorrdeviceDto; -import org.nl.modules.wql.WQL; -import org.nl.modules.wql.core.bean.WQLObject; -import org.nl.modules.wql.util.WqlUtil; -import org.springframework.data.domain.Pageable; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.List; -import java.util.Map; - -/** - * @author geng by - * @description 服务实现 - * @date 2022-05-26 - **/ -@Service -@RequiredArgsConstructor -@Slf4j -public class PersoncorrdeviceServiceImpl implements PersoncorrdeviceService { - - @Override - public Map queryAll(Map whereJson, Pageable page) { - String search = MapUtil.getStr(whereJson, "search"); - JSONObject map = new JSONObject(); - map.put("flag", "1"); - if (!StrUtil.isEmpty(search)) { - map.put("search", "%" + search + "%"); - } - JSONObject json = WQL.getWO("MPS_Personcorrdevice001").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "view_person.jockey_id"); - return json; - } - - @Override - public List queryAll(Map whereJson) { - WQLObject wo = WQLObject.getWQLObject("pdm_bi_personcorrdevice"); - JSONArray arr = wo.query().getResultJSONArray(0); - if (ObjectUtil.isNotEmpty(arr)) return arr.toJavaList(PersoncorrdeviceDto.class); - return null; - } - - @Override - public PersoncorrdeviceDto findById(Long team_person_device_id) { - WQLObject wo = WQLObject.getWQLObject("pdm_bi_personcorrdevice"); - JSONObject json = wo.query("team_person_device_id = '" + team_person_device_id + "'").uniqueResult(0); - if (ObjectUtil.isNotEmpty(json)) { - return json.toJavaObject(PersoncorrdeviceDto.class); - } - return null; - } - - @Override - public PersoncorrdeviceDto findByCode(String code) { - WQLObject wo = WQLObject.getWQLObject("pdm_bi_personcorrdevice"); - JSONObject json = wo.query("code ='" + code + "'").uniqueResult(0); - if (ObjectUtil.isNotEmpty(json)) { - return json.toJavaObject(PersoncorrdeviceDto.class); - } - return null; - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void create(PersoncorrdeviceDto dto) { - String currentUserId = SecurityUtils.getCurrentUserId(); - String nickName = SecurityUtils.getCurrentNickName(); - String now = DateUtil.now(); - - dto.setTeam_person_device_id(IdUtil.getSnowflake(1, 1).nextId()); - - WQLObject wo = WQLObject.getWQLObject("pdm_bi_personcorrdevice"); - JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto)); - wo.insert(json); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void update(PersoncorrdeviceDto dto) { - PersoncorrdeviceDto entity = this.findById(dto.getTeam_person_device_id()); - if (entity == null) throw new BadRequestException("被删除或无权限，操作失败!"); - - String currentUserId = SecurityUtils.getCurrentUserId(); - String nickName = SecurityUtils.getCurrentNickName(); - - String now = DateUtil.now(); - WQLObject wo = WQLObject.getWQLObject("pdm_bi_personcorrdevice"); - JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto)); - wo.update(json); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void deleteAll(Long[] ids) { - WQLObject wo = WQLObject.getWQLObject("pdm_bi_personcorrdevice"); - for (Long jockey_id : ids) { - wo.delete("jockey_id = '" + jockey_id + "'"); - } - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void addPersons(JSONObject param) { - final JSONArray persons = param.getJSONArray("persons"); - WQLObject wo = WQLObject.getWQLObject("pdm_bi_personcorrdevice"); - for (int i = 0; i < persons.size(); i++) { - final JSONObject jsonObject = persons.getJSONObject(i); - final String id = jsonObject.getString("id"); - final JSONArray jsonArray = wo.query("jockey_id = '" + id + "'").getResultJSONArray(0); - if (ObjectUtil.isEmpty(jsonArray)) { - JSONObject map = new JSONObject(); - map.put("team_person_device_id", IdUtil.getSnowflake(1, 1).nextId()); - map.put("jockey_id", id); - wo.insert(map); - } - } - } - - @Override - public Map getDeviceByPerson(Map whereJson, Pageable page) { - String user_id = MapUtil.getStr(whereJson, "user_id"); - JSONObject map2 = new JSONObject(); - map2.put("flag", "3"); - map2.put("user_id", user_id); - //根据人员获取设备信息 - JSONObject json = WQL.getWO("MPS_Personcorrdevice001").addParamMap(map2).pageQuery(WqlUtil.getHttpContext(page), "device.device_code"); - JSONArray jsonArray = json.getJSONArray("content"); - JSONArray newContent = new JSONArray(); - for (int i = 0; i < jsonArray.size(); i++) { - JSONObject jsonObject = jsonArray.getJSONObject(i); - JSONObject map = new JSONObject(); - String device_id = jsonObject.getString("device_id"); - map.put("flag", "4"); - map.put("device_id", device_id); - //获取设备所拥有的项点信息 - JSONArray itemArray = WQL.getWO("MPS_Personcorrdevice001").addParamMap(map).process().getResultJSONArray(0); - JSONObject newMap = new JSONObject(); - newMap.put("team_person_device_id", jsonObject.getString("team_person_device_id")); - newMap.put("device_id", jsonObject.getString("device_id")); - newMap.put("device_code", jsonObject.getString("device_code")); - newMap.put("device_name", jsonObject.getString("device_name")); - newMap.put("workprocedure_code", jsonObject.getString("workprocedure_code")); - newMap.put("workprocedure_name", jsonObject.getString("workprocedure_name")); - //循环每个设备的项点信息，将项点所对应的键设为项点编码，对应动态表格的prop - for (int j = 0; j < itemArray.size(); j++) { - JSONObject itemObject = itemArray.getJSONObject(j); - newMap.put(itemObject.getString("item_code"), itemObject.getString("item_value")); - } - newContent.add(newMap); - } - json.put("content", newContent); - return json; - } - - @Override - public Map getHeader(JSONObject param) { - //动态获取设备类型下对应的项点信息 - String user_id = param.getString("user_id"); - JSONObject map = new JSONObject(); - map.put("flag", "2"); - map.put("user_id", user_id); - final JSONArray jsonArray = WQL.getWO("MPS_Personcorrdevice001").addParamMap(map).process().getResultJSONArray(0); - JSONArray newArray = new JSONArray(); - for (int i = 0; i < jsonArray.size(); i++) { - JSONObject jsonObject = jsonArray.getJSONObject(i); - String item_name = jsonObject.getString("item_name"); - JSONObject json = new JSONObject(); - json.put("label", item_name); - //将表格prop设置为项点编码 - json.put("prop", jsonObject.getString("item_code")); - json.put("show", true); - if (item_name.length() >= 6) { - json.put("width", "150"); - } - newArray.add(json); - } - JSONObject resultMap = new JSONObject(); - resultMap.put("newArray", newArray); - return resultMap; - } - - @Override - public JSONArray getDeviceIdByUserId(JSONObject param) { - WQLObject wo = WQLObject.getWQLObject("pdm_bi_personcorrdevice"); - final JSONArray resultJSONArray = wo.query("jockey_id = '" + param.getString("user_id") + "'").getResultJSONArray(0); - return resultJSONArray; - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void addDevices(JSONObject param) { - WQLObject wo = WQLObject.getWQLObject("pdm_bi_personcorrdevice"); - final String user_id = param.getString("user_id"); - final JSONArray devices = param.getJSONArray("devices"); - final JSONObject is_exists = wo.query("jockey_id = '" + user_id + "' and (device_id is null or device_id = '" + "" + "')").uniqueResult(0); - if (ObjectUtil.isNotEmpty(is_exists)) { - wo.delete("jockey_id = '" + user_id + "'"); - } - for (int i = 0; i < devices.size(); i++) { - final JSONObject jsonObject = devices.getJSONObject(i); - final String device_id = jsonObject.getString("device_id"); - final JSONObject object = wo.query("jockey_id = '" + user_id + "' and device_id = '" + device_id + "'").uniqueResult(0); - if (ObjectUtil.isEmpty(object)) { - JSONObject map = new JSONObject(); - map.put("team_person_device_id", IdUtil.getSnowflake(1, 1).nextId()); - map.put("jockey_id", user_id); - map.put("device_id", device_id); - wo.insert(map); - } - } - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void deleteRow(JSONObject param) { - JSONArray rows = param.getJSONArray("rows"); - final String user_id = param.getString("user_id"); - WQLObject wo = WQLObject.getWQLObject("pdm_bi_personcorrdevice"); - for (int i = 0; i < rows.size(); i++) { - final JSONObject jsonObject = rows.getJSONObject(i); - final String team_person_device_id = jsonObject.getString("team_person_device_id"); - final JSONArray resultJSONArray = wo.query("team_person_device_id = '" + team_person_device_id + "'").getResultJSONArray(0); - wo.delete("team_person_device_id = '" + team_person_device_id + "'"); - } - final JSONArray resultJSONArray = wo.query("jockey_id = '" + user_id + "'").getResultJSONArray(0); - if (ObjectUtil.isEmpty(resultJSONArray)){ - JSONObject map = new JSONObject(); - map.put("team_person_device_id",IdUtil.getSnowflake(1, 1).nextId()); - map.put("jockey_id",user_id); - wo.insert(map); - } - } - -} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/mps/service/impl/ProduceshiftorderServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/mps/service/impl/ProduceshiftorderServiceImpl.java deleted file mode 100644 index d5eec3a2a..000000000 --- a/lms/nladmin-system/src/main/java/org/nl/wms/mps/service/impl/ProduceshiftorderServiceImpl.java +++ /dev/null @@ -1,445 +0,0 @@ -package org.nl.wms.mps.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.JSON; -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.system.service.dept.ISysDeptService; -import org.nl.system.service.dept.dao.SysDept; -import org.nl.system.service.user.dto.CurrentUser; - -import org.nl.modules.system.util.CodeUtil; -import org.nl.common.utils.SecurityUtils; -import org.nl.wms.basedata.master.service.ClassstandardService; -import org.nl.wms.ext.acs.service.WmsToAcsService; -import org.nl.wms.mps.service.ProduceshiftorderService; -import org.nl.wms.mps.service.dto.ProduceshiftorderDto; -import org.nl.modules.wql.WQL; -import org.nl.modules.wql.core.bean.WQLObject; -import org.nl.modules.wql.util.WqlUtil; -import org.springframework.data.domain.Pageable; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; -import org.springframework.util.CollectionUtils; - -import java.util.List; -import java.util.Map; - -/** - * @author qinx - * @description 服务实现 - * @date 2022-05-24 - **/ -@Service -@RequiredArgsConstructor -@Slf4j -public class ProduceshiftorderServiceImpl implements ProduceshiftorderService { - - private final ClassstandardService classstandardService; - private final WmsToAcsService wmsToAcsService; - private final ISysDeptService deptService; - - @Override - public Map queryAll(Map whereJson, Pageable page) { - String produceorder_code = MapUtil.getStr(whereJson, "produceorder_code"); - String material = MapUtil.getStr(whereJson, "material"); - String begin_time = MapUtil.getStr(whereJson, "begin_time"); - String end_time = MapUtil.getStr(whereJson, "end_time"); - String order_type_scode = MapUtil.getStr(whereJson, "order_type_scode"); - String order_status = MapUtil.getStr(whereJson, "order_status"); - String shift_type_scode = MapUtil.getStr(whereJson, "shift_type_scode"); - String sale_id = MapUtil.getStr(whereJson, "sale_id"); - JSONObject map = new JSONObject(); - map.put("flag", "1"); - map.put("order_type_scode", order_type_scode); - //map.put("order_status", order_status); - map.put("shift_type_scode", shift_type_scode); - map.put("begin_time", begin_time); - map.put("end_time", end_time); - if (StrUtil.isNotEmpty(order_status)) { - order_status = order_status.replace("[\"", "").replace("\"]", "").replace("\"", ""); - } - map.put("order_status", order_status); - //处理状态为未完成 - if (StrUtil.isNotEmpty(order_status) && order_status.contains("-1")) { - map.put("unFinish", "-1"); - map.put("order_status", order_status.replace("-1", "")); - } - if (StrUtil.isNotEmpty(produceorder_code)) { - map.put("produceorder_code", "%" + produceorder_code + "%"); - } - if (StrUtil.isNotEmpty(material)) { - map.put("material", "%" + material + "%"); - } - if (StrUtil.isNotEmpty(sale_id)) { - map.put("sale_id", "%" + sale_id + "%"); - } - JSONObject jsonObject = WQL.getWO("MPS_PRODUCEDURE001").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "ShiftOrder.update_time desc"); - return jsonObject; - } - - @Override - public List queryAll(Map whereJson) { - WQLObject wo = WQLObject.getWQLObject("mps_bd_produceshiftorder"); - JSONArray arr = wo.query().getResultJSONArray(0); - if (ObjectUtil.isNotEmpty(arr)) return arr.toJavaList(ProduceshiftorderDto.class); - return null; - } - - @Override - public ProduceshiftorderDto findById(Long produceorder_id) { - WQLObject wo = WQLObject.getWQLObject("mps_bd_produceshiftorder"); - JSONObject json = wo.query("produceorder_id = '" + produceorder_id + "'").uniqueResult(0); - if (ObjectUtil.isNotEmpty(json)) { - return json.toJavaObject(ProduceshiftorderDto.class); - } - return null; - } - - @Override - public ProduceshiftorderDto findByCode(String code) { - WQLObject wo = WQLObject.getWQLObject("mps_bd_produceshiftorder"); - JSONObject json = wo.query("code ='" + code + "'").uniqueResult(0); - if (ObjectUtil.isNotEmpty(json)) { - return json.toJavaObject(ProduceshiftorderDto.class); - } - return null; - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void create(ProduceshiftorderDto dto) { - String currentUserId = SecurityUtils.getCurrentUserId(); - String nickName = SecurityUtils.getCurrentNickName(); - String now = DateUtil.now(); - CurrentUser currentUser= SecurityUtils.getCurrentUser(); - String newCode = CodeUtil.getNewCode("PDM_SHIFTORDER"); - dto.setProduceorder_id(IdUtil.getSnowflake(1, 1).nextId()); - dto.setProduceorder_code(newCode); - dto.setProducedeviceorder_code(newCode); - dto.setOrder_status("00"); - 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("mps_bd_produceshiftorder"); - JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto)); - List depts = deptService.getUserDeptRelation(currentUser.getId()); - if (!CollectionUtils.isEmpty(depts)){ - String deptId = depts.get(0).getDeptId(); - json.put("sysdeptid", deptId); - json.put("syscompanyid", deptId); - } - wo.insert(json); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void update(ProduceshiftorderDto dto) { - ProduceshiftorderDto entity = this.findById(dto.getProduceorder_id()); - if (entity == null) throw new BadRequestException("被删除或无权限，操作失败!"); - - String 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("mps_bd_produceshiftorder"); - JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto)); - wo.update(json); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void deleteAll(Long[] ids) { - String currentUserId = SecurityUtils.getCurrentUserId(); - String nickName = SecurityUtils.getCurrentNickName(); - String now = DateUtil.now(); - - WQLObject wo = WQLObject.getWQLObject("mps_bd_produceshiftorder"); - for (Long produceorder_id : ids) { - JSONObject param = new JSONObject(); - param.put("produceorder_id", String.valueOf(produceorder_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 submits(JSONObject param) { - String currentUserId = SecurityUtils.getCurrentUserId(); - String nickName = SecurityUtils.getCurrentNickName(); - String now = DateUtil.now(); - - WQLObject wo = WQLObject.getWQLObject("mps_bd_produceshiftorder"); - JSONObject json = wo.query("produceorder_id = '" + param.getString("produceorder_id") + "'").uniqueResult(0); - if (ObjectUtil.isEmpty(json.getString("device_id"))) throw new BadRequestException("请先绑定设备"); - - JSONArray orderArr = wo.query("device_id = '" + param.getString("device_id") + "' and order_status = '02'").getResultJSONArray(0); - if (ObjectUtil.isNotEmpty(orderArr)) throw new BadRequestException("当前设备正在生产中"); - - json.put("order_status", "02"); - json.put("update_optid", currentUserId); - json.put("update_optname", nickName); - json.put("update_time", now); - wo.update(json); - } - - @Override - public JSONArray getDevice(JSONObject param) { - final String workprocedure_id = param.getString("workprocedure_id"); - String currentUserId = SecurityUtils.getCurrentUserId(); - JSONObject map = new JSONObject(); - map.put("flag", "4"); - map.put("jockey_id", currentUserId + ""); - map.put("workprocedure_id", workprocedure_id); - final JSONArray resultJSONArray = WQL.getWO("MPS_PRODUCEDURE001").addParamMap(map).process().getResultJSONArray(0); - return resultJSONArray; - } - - @Override - public JSONArray getTable(JSONObject param) { - //获取当前登录用户下的所有设备 - String currentUserId = SecurityUtils.getCurrentUserId(); - JSONObject map1 = new JSONObject(); - map1.put("flag", "2"); - map1.put("jockey_id", currentUserId + ""); - JSONArray devices = WQL.getWO("MPS_PRODUCEDURE001").addParamMap(map1).process().getResultJSONArray(0); - //根据当前用户下的所有设备查询所属工序 - JSONObject map = new JSONObject(); - map.put("flag", "3"); - StringBuilder sb = new StringBuilder(); - if (ObjectUtil.isNotEmpty(devices)) { - sb.append("("); - for (int i = 0; i < devices.size(); i++) { - JSONObject device = devices.getJSONObject(i); - String workprocedure_id = device.getString("workprocedure_id"); - if (devices.size() - 1 == i) { - sb.append("'" + workprocedure_id + "')"); - } - if (devices.size() - 1 != i) { - sb.append("'" + workprocedure_id + "',"); - } - } - map.put("workprocedure_ids", sb.toString()); - } else { - map.put("workprocedure_ids", "('-1')"); - } - //根据当前用户的设备所属的工序查询属于自己的工单表 - JSONArray resultJSONArray = WQL.getWO("MPS_PRODUCEDURE001").addParamMap(map).process().getResultJSONArray(0); - return resultJSONArray; - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void openStart(JSONObject param) { - String currentUserId = SecurityUtils.getCurrentUserId(); - String nickName = SecurityUtils.getCurrentNickName(); - String now = DateUtil.now(); - String device_id = param.getString("device_id"); - WQLObject wo_device = WQLObject.getWQLObject("em_bi_deviceinfo"); - JSONObject device = wo_device.query("device_id = '" + device_id + "'").uniqueResult(0); - String device_code = device.getString("device_code"); - JSONObject row = param.getJSONObject("row"); - String produceorder_id = row.getString("produceorder_id"); - String workprocedure_id = row.getString("workprocedure_id"); - String produceorder_code = row.getString("produceorder_code"); - String material_id = row.getString("material_id"); - String material_code = row.getString("material_code"); - String material_name = row.getString("material_name"); - String material_spec = row.getString("material_spec"); - String is_needmove = row.getString("is_needmove"); - String plan_qty = row.getString("plan_qty"); - String order_status = row.getString("order_status"); - //开工时修改生产班次工单表 生产设备、以及工单状态 - WQLObject wo = WQLObject.getWQLObject("MPS_BD_ProduceShiftOrder"); - JSONObject jsonObject1 = wo.query("produceorder_id = '" + produceorder_id + "'").uniqueResult(0); - JSONObject produceorderMap = new JSONObject(); - produceorderMap.put("produceorder_id", produceorder_id); - produceorderMap.put("device_id", device_id); - produceorderMap.put("order_status", "02"); - produceorderMap.put("update_optid", currentUserId); - produceorderMap.put("update_optname", nickName); - produceorderMap.put("update_time", now); - if (order_status.equals("01")){ - produceorderMap.put("realproducestart_date", now); - } - wo.update(produceorderMap); - //同时工单记录表中插入一条数据 - WQLObject wo_record = WQLObject.getWQLObject("MPS_BD_MacOperateRecord"); - JSONObject recordMap = new JSONObject(); - recordMap.put("macoperate_id", IdUtil.getSnowflake(1, 1).nextId()); - recordMap.put("device_id", device_id); - recordMap.put("workprocedure_id", workprocedure_id); - recordMap.put("produceorder_id", produceorder_id); - recordMap.put("produceorder_code", produceorder_code); - recordMap.put("init_qty", jsonObject1.getString("real_qty")); - //填写生产记录表中的生产数量时，先判断是否已经生产过了，如果没有生产过，就将工单记录表中的计划数量付给记录表中的生产数量 - final JSONArray alreadyPro = wo_record.query("produceorder_id = '" + produceorder_id + "'").getResultJSONArray(0); - if (ObjectUtil.isEmpty(alreadyPro)) { - recordMap.put("produce_qty", plan_qty); - //同时向acs系统下发工单 问题是现在一个工单分多次执行，现在是每开工一次，向acs发送一次工单 - //acs那边就会新增多个工单 - //如果是第一次开工，就向acs下发工单 - // TODO - JSONArray array = new JSONArray(); - JSONObject acsObj = new JSONObject(); - acsObj.put("ext_order_id",produceorder_id); - acsObj.put("is_needmove",is_needmove); - acsObj.put("order_code",produceorder_code); - acsObj.put("qty",plan_qty); - acsObj.put("material_uuid",material_id); - acsObj.put("material_code",material_code); - acsObj.put("material_name",material_name); - acsObj.put("material_spec",material_spec); - acsObj.put("device_code",device_code); - array.add(acsObj); - wmsToAcsService.order(array); - } else { - Integer sum = 0; - //如果生产过了，就获取记录表中的报工数量，用计划数量减去生产过的报工数量的和，为这次的生产数量 - for (int i = 0; i < alreadyPro.size(); i++) { - JSONObject jsonObject = alreadyPro.getJSONObject(i); - String report_qty = jsonObject.getString("report_qty"); - sum += Integer.parseInt(report_qty); - } - Integer produce_qty = Integer.parseInt(plan_qty) - sum; - recordMap.put("produce_qty", produce_qty); - //wms向acs发送请求 工单恢复 - //如果不是第一次开工，就向acs发送恢复工单状态 - // TODO - JSONArray array = new JSONArray(); - JSONObject map = new JSONObject(); - map.put("ext_order_id",produceorder_id); - map.put("type","2"); - array.add(map); - wmsToAcsService.orderStatusUpdate(array); - } - recordMap.put("operatetime_start", now); - recordMap.put("jockey_id", currentUserId); - wo_record.insert(recordMap); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void saveReport(JSONObject param) { - String currentUserId = SecurityUtils.getCurrentUserId(); - String nickName = SecurityUtils.getCurrentNickName(); - String now = DateUtil.now(); - final String report_qty = param.getString("report_qty"); - final JSONObject row = param.getJSONObject("row"); - final String produceorder_id = row.getString("produceorder_id"); - //报工时工单的工单状态为暂停，报工数量为这条工单上次加这次报工数量的和，也就是这条工单每次记录的和 - WQLObject wo = WQLObject.getWQLObject("MPS_BD_ProduceShiftOrder"); - JSONObject jsonObject = wo.query("produceorder_id = '" + produceorder_id + "'").uniqueResult(0); - JSONObject produceorderMap = new JSONObject(); - produceorderMap.put("produceorder_id",produceorder_id); - if (row.getString("report_qty").equals("0") || StrUtil.isEmpty(row.getString("report_qty"))){ - produceorderMap.put("report_qty",report_qty); - }else { - Integer sum = Integer.parseInt(row.getString("report_qty")) + Integer.parseInt(report_qty); - produceorderMap.put("report_qty",sum); - } - produceorderMap.put("order_status", "03"); - produceorderMap.put("update_optid", currentUserId); - produceorderMap.put("update_optname", nickName); - produceorderMap.put("update_time", now); - wo.update(produceorderMap); - //同时修改这条工单对应的记录表中最新的一条数据的报工数量 - WQLObject wo_record = WQLObject.getWQLObject("MPS_BD_MacOperateRecord"); - //获取最新的工单的对应记录信息 - JSONObject newRecord = wo_record.query("produceorder_id = '"+produceorder_id+"' and (operatetime_end is null or operatetime_end = '')").uniqueResult(0); - newRecord.put("report_qty",report_qty); - newRecord.put("finish_qty",jsonObject.getString("real_qty")); - Integer finishproduct_qty = Integer.parseInt(jsonObject.getString("real_qty")) - Integer.parseInt(newRecord.getString("init_qty")); - newRecord.put("finishproduct_qty",finishproduct_qty); - newRecord.put("operatetime_end",now); - wo_record.update(newRecord); - //wms向acs发送请求 工单暂停 - // 报工的时候同时向acs发送工单暂停状态 - // TODO - JSONArray array = new JSONArray(); - JSONObject map = new JSONObject(); - map.put("ext_order_id",produceorder_id); - map.put("type","1"); - array.add(map); - wmsToAcsService.orderStatusUpdate(array); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void finish(JSONObject param) { - String currentUserId = SecurityUtils.getCurrentUserId(); - String nickName = SecurityUtils.getCurrentNickName(); - String now = DateUtil.now(); - JSONObject row = param.getJSONObject("row"); - String produceorder_id = row.getString("produceorder_id"); - WQLObject wo = WQLObject.getWQLObject("MPS_BD_ProduceShiftOrder"); - JSONObject produceorderMap = new JSONObject(); - produceorderMap.put("produceorder_id",produceorder_id); - produceorderMap.put("order_status","04"); - produceorderMap.put("update_optid", currentUserId); - produceorderMap.put("device_id", null); - produceorderMap.put("update_optname", nickName); - produceorderMap.put("update_time", now); - produceorderMap.put("realproduceend_date", now); - wo.update(produceorderMap); - //wms向acs发送请求 工单强制完成 - // TODO - JSONArray array = new JSONArray(); - JSONObject map = new JSONObject(); - map.put("ext_order_id",produceorder_id); - map.put("type","3"); - array.add(map); - wmsToAcsService.orderStatusUpdate(array); - } - - @Override - public JSONObject getReportWork(JSONObject param) { - String produceorder_id = param.getString("produceorder_id"); - WQLObject wo = WQLObject.getWQLObject("MPS_BD_ProduceShiftOrder"); - JSONObject jsonProduceShiftOrder = wo.query("produceorder_id = '" + produceorder_id + "'").uniqueResult(0); - WQLObject wo_record = WQLObject.getWQLObject("MPS_BD_MacOperateRecord"); - //获取最新的工单的对应记录信息 - JSONObject jsonObject = wo_record.query("produceorder_id = '"+produceorder_id+"' and (operatetime_end is null or operatetime_end = '')").uniqueResult(0); - String finish_qty = jsonProduceShiftOrder.getString("real_qty"); - jsonObject.put("finish_qty",finish_qty); - Integer finishproduct_qty = Integer.parseInt(finish_qty) - Integer.parseInt(jsonObject.getString("init_qty")); - jsonObject.put("finishproduct_qty",finishproduct_qty); - return jsonObject; - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void forceFinish(JSONObject param) { - this.finish(param); - } - - @Override - public JSONArray getDtl(JSONObject param) { - final String produceorder_id = param.getString("produceorder_id"); - JSONObject map = new JSONObject(); - map.put("flag","5"); - map.put("produceorder_id",produceorder_id); - JSONArray resultJSONArray = WQL.getWO("MPS_PRODUCEDURE001").addParamMap(map).process().getResultJSONArray(0); - return resultJSONArray; - } - -} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/mps/service/impl/TeamcorrpersonServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/mps/service/impl/TeamcorrpersonServiceImpl.java deleted file mode 100644 index e70bd24a6..000000000 --- a/lms/nladmin-system/src/main/java/org/nl/wms/mps/service/impl/TeamcorrpersonServiceImpl.java +++ /dev/null @@ -1,76 +0,0 @@ - -package org.nl.wms.mps.service.impl; - - -import cn.hutool.core.map.MapUtil; -import cn.hutool.core.util.IdUtil; -import cn.hutool.core.util.ObjectUtil; -import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.nl.wms.mps.service.TeamcorrpersonService; -import org.nl.modules.wql.WQL; -import org.nl.modules.wql.core.bean.WQLObject; -import org.nl.modules.wql.util.WqlUtil; -import org.springframework.data.domain.Pageable; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.Map; - -/** - * @author geng by - * @description 服务实现 - * @date 2022-05-26 - **/ -@Service -@RequiredArgsConstructor -@Slf4j -public class TeamcorrpersonServiceImpl implements TeamcorrpersonService { - - @Override - public Map queryAll(Map whereJson, Pageable page) { - String team_id = MapUtil.getStr(whereJson, "team_id"); - JSONObject map = new JSONObject(); - map.put("flag", "1"); - map.put("team_id", team_id); - JSONObject json = WQL.getWO("MPS_Teamcorrperson001").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "teamPerson.jockey_id"); - return json; - } - - @Override - public JSONArray getPersonIdByTeamId(JSONObject param) { - WQLObject wo = WQLObject.getWQLObject("PDM_BI_TeamCorrPerson"); - final JSONArray resultJSONArray = wo.query("team_id = '" + param.getString("team_id") + "'").getResultJSONArray(0); - return resultJSONArray; - } - - @Override - public void addPersons(JSONObject param) { - WQLObject wo = WQLObject.getWQLObject("PDM_BI_TeamCorrPerson"); - final String team_id = param.getString("team_id"); - final JSONArray persons = param.getJSONArray("persons"); - for (int i = 0; i < persons.size(); i++) { - final JSONObject jsonObject = persons.getJSONObject(i); - final String id = jsonObject.getString("id"); - final JSONObject object = wo.query("team_id = '" + team_id + "' and jockey_id = '" + id + "'").uniqueResult(0); - if (ObjectUtil.isEmpty(object)) { - JSONObject map = new JSONObject(); - map.put("team_person_id", IdUtil.getSnowflake(1, 1).nextId()); - map.put("team_id", team_id); - map.put("jockey_id", id); - wo.insert(map); - } - } - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void deleteAll(Long[] ids) { - WQLObject wo = WQLObject.getWQLObject("PDM_BI_TeamCorrPerson"); - for (Long team_person_id : ids) { - wo.delete("team_person_id = '" + team_person_id + "'"); - } - } -} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/mps/service/impl/WorkteamServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/mps/service/impl/WorkteamServiceImpl.java deleted file mode 100644 index 6df622393..000000000 --- a/lms/nladmin-system/src/main/java/org/nl/wms/mps/service/impl/WorkteamServiceImpl.java +++ /dev/null @@ -1,186 +0,0 @@ - -package org.nl.wms.mps.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.JSON; -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.common.utils.SecurityUtils; -import org.nl.system.service.dept.ISysDeptService; -import org.nl.system.service.dept.dao.SysDept; -import org.nl.system.service.user.dto.CurrentUser; - -import org.nl.wms.mps.service.WorkteamService; -import org.nl.wms.mps.service.dto.WorkteamDto; -import org.nl.modules.wql.core.bean.ResultBean; -import org.nl.modules.wql.core.bean.WQLObject; -import org.nl.modules.wql.util.WqlUtil; -import org.springframework.data.domain.Pageable; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; -import org.springframework.util.CollectionUtils; - -import java.util.List; -import java.util.Map; - -/** - * @author geng by - * @description 服务实现 - * @date 2022-05-25 - **/ -@Service -@RequiredArgsConstructor -@Slf4j -public class WorkteamServiceImpl implements WorkteamService { - - private final ISysDeptService deptService; - - @Override - public Map queryAll(Map whereJson, Pageable page) { - WQLObject wo = WQLObject.getWQLObject("pdm_bi_workteam"); - final String search = MapUtil.getStr(whereJson, "search"); - String where = ""; - if (!StrUtil.isEmpty(search)) { - where = " AND (team_code like '%" + search + "%' OR team_name like '%" + search + "%' ) "; - } - ResultBean rb = wo.pagequery(WqlUtil.getHttpContext(page), "is_delete = '0'" + where, "update_time desc"); - final JSONObject json = rb.pageResult(); - return json; - } - - @Override - public List queryAll(Map whereJson) { - WQLObject wo = WQLObject.getWQLObject("pdm_bi_workteam"); - JSONArray arr = wo.query().getResultJSONArray(0); - if (ObjectUtil.isNotEmpty(arr)) return arr.toJavaList(WorkteamDto.class); - return null; - } - - @Override - public WorkteamDto findById(Long team_id) { - WQLObject wo = WQLObject.getWQLObject("pdm_bi_workteam"); - JSONObject json = wo.query("team_id = '" + team_id + "'").uniqueResult(0); - if (ObjectUtil.isNotEmpty(json)) { - return json.toJavaObject(WorkteamDto.class); - } - return null; - } - - @Override - public WorkteamDto findByCode(String code) { - WQLObject wo = WQLObject.getWQLObject("pdm_bi_workteam"); - JSONObject json = wo.query("team_code ='" + code + "'").uniqueResult(0); - if (ObjectUtil.isNotEmpty(json)) { - return json.toJavaObject(WorkteamDto.class); - } - return null; - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void create(WorkteamDto dto) { - String currentUserId = SecurityUtils.getCurrentUserId(); - String nickName = SecurityUtils.getCurrentNickName(); - String now = DateUtil.now(); - CurrentUser currentUser = SecurityUtils.getCurrentUser(); - - //编码唯一性校验 - String team_code = dto.getTeam_code(); - WorkteamDto byCode = this.findByCode(team_code); - if (ObjectUtil.isNotEmpty(byCode)) throw new BadRequestException("编码已存在!"); - - dto.setTeam_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); - List depts = deptService.getUserDeptRelation(currentUser.getId()); - if (!CollectionUtils.isEmpty(depts)){ - String deptId = depts.get(0).getDeptId(); - dto.setSyscompanyid(deptId); - dto.setSysdeptid(deptId); - } - - - WQLObject wo = WQLObject.getWQLObject("pdm_bi_workteam"); - JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto)); - wo.insert(json); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void update(WorkteamDto dto) { - WorkteamDto entity = this.findById(dto.getTeam_id()); - if (entity == null) throw new BadRequestException("被删除或无权限，操作失败!"); - - //编码唯一性校验 - WQLObject wo = WQLObject.getWQLObject("pdm_bi_workteam"); - String where = "is_delete = '0' and team_code = '" + dto.getTeam_code() + "' and team_id != '" + dto.getTeam_id() + "'"; - - JSONObject jsonObject = wo.query(where).uniqueResult(0); - if (ObjectUtil.isNotEmpty(jsonObject)) { - throw new BadRequestException("编码已存在!"); - } - - String currentUserId = SecurityUtils.getCurrentUserId(); - String nickName = SecurityUtils.getCurrentNickName(); - - String now = DateUtil.now(); - dto.setUpdate_time(now); - dto.setUpdate_optid(currentUserId); - dto.setUpdate_optname(nickName); - - - JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto)); - wo.update(json); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void deleteAll(Long[] ids) { - WQLObject wo = WQLObject.getWQLObject("pdm_bi_workteam"); - WQLObject wo_person = WQLObject.getWQLObject("PDM_BI_TeamCorrPerson"); - for (Long team_id : ids) { - wo.delete("team_id = '" + team_id + "'"); - wo_person.delete("team_id = '" + team_id + "'"); - } - } - - @Override - public JSONArray getClasssystem() { - // WQLObject wo = WQLObject.getWQLObject("PDM_BI_ClassSystem"); - // final JSONArray resultJSONArray = wo.query("is_delete = '0'").getResultJSONArray(0); - //return resultJSONArray; - return null; - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void changeActive(JSONObject json) { - - String currentUserId = SecurityUtils.getCurrentUserId(); - String nickName = SecurityUtils.getCurrentNickName(); - String now = DateUtil.now(); - - String is_active = "1"; - if (StrUtil.equals("1", json.getString("is_active"))) { - is_active = "0"; - } - json.put("is_active", is_active); - json.put("update_optid", currentUserId); - json.put("update_optname", nickName); - json.put("update_time", now); - WQLObject.getWQLObject("PDM_BI_WorkTeam").update(json); - } - -} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/mps/wql/MPS_PRODUCEDURE001.wql b/lms/nladmin-system/src/main/java/org/nl/wms/mps/wql/MPS_PRODUCEDURE001.wql deleted file mode 100644 index bd8842574..000000000 --- a/lms/nladmin-system/src/main/java/org/nl/wms/mps/wql/MPS_PRODUCEDURE001.wql +++ /dev/null @@ -1,178 +0,0 @@ -[交易说明] - 交易名： 工单分页查询 - 所属模块： - 功能简述： - 版权所有： - 表引用： - 版本经历： - -[数据库] - --指定数据库，为空采用默认值，默认为db.properties中列出的第一个库 - -[IO定义] - ################################################# - ## 表字段对应输入参数 - ################################################# - 输入.flag TYPEAS s_string - 输入.jockey_id TYPEAS s_string - 输入.sale_id TYPEAS s_string - 输入.produceorder_id TYPEAS s_string - 输入.workprocedure_id TYPEAS s_string - 输入.order_type_scode TYPEAS s_string - 输入.order_status TYPEAS s_string - 输入.shift_type_scode TYPEAS s_string - 输入.begin_time TYPEAS s_string - 输入.end_time TYPEAS s_string - 输入.produceorder_code TYPEAS s_string - 输入.material TYPEAS s_string - 输入.product_series TYPEAS f_string - 输入.workprocedure_ids TYPEAS f_string - 输入.unFinish TYPEAS s_string - - -[临时表] - --这边列出来的临时表就会在运行期动态创建 - -[临时变量] - --所有中间过程变量均可在此处定义 - -[业务过程] - - ########################################## - # 1、输入输出检查 # - ########################################## - - - ########################################## - # 2、主过程前处理 # - ########################################## - - - ########################################## - # 3、业务主过程 # - ########################################## - - IF 输入.flag = "1" - PAGEQUERY - SELECT - ShiftOrder.*, - material.material_code, - material.material_name, - material.material_spec, - material.product_series, - classstandard.class_id, - classstandard.class_name, - device.device_name - FROM - MPS_BD_ProduceShiftOrder ShiftOrder - LEFT JOIN md_me_materialbase material ON material.material_id = ShiftOrder.material_id - LEFT JOIN em_bi_deviceinfo device ON ShiftOrder.device_id = device.device_id - LEFT JOIN md_pb_classstandard classstandard ON classstandard.class_id = material.product_series - WHERE - ShiftOrder.is_delete = '0' - OPTION 输入.order_type_scode <> "" - ShiftOrder.order_type_scode = 输入.order_type_scode - ENDOPTION - OPTION 输入.unFinish <> "" - ShiftOrder.order_status <> '04' - ENDOPTION - OPTION 输入.order_status <> "" - find_in_set( ShiftOrder.order_status, 输入.order_status) - ENDOPTION - OPTION 输入.shift_type_scode <> "" - ShiftOrder.shift_type_scode = 输入.shift_type_scode - ENDOPTION - OPTION 输入.begin_time <> "" - ShiftOrder.produce_date >= 输入.begin_time - ENDOPTION - OPTION 输入.end_time <> "" - ShiftOrder.produce_date <= 输入.end_time - ENDOPTION - OPTION 输入.sale_id <> "" - ShiftOrder.sale_id like 输入.sale_id - ENDOPTION - OPTION 输入.produceorder_code <> "" - ShiftOrder.produceorder_code like 输入.produceorder_code - ENDOPTION - OPTION 输入.material <> "" - ( - material.material_code like 输入.material or - material.material_name like 输入.material or - material.material_spec like 输入.material - ) - ENDOPTION - ENDSELECT - ENDPAGEQUERY - ENDIF - - IF 输入.flag = "2" - QUERY - SELECT - personDevice.*, - device.device_code, - device.device_name, - device.workprocedure_id - FROM - PDM_BI_PersonCorrDevice personDevice - LEFT JOIN em_bi_deviceinfo device ON personDevice.device_id = device.device_id - WHERE - device.is_delete = '0' and personDevice.jockey_id = 输入.jockey_id - ENDSELECT - ENDQUERY - ENDIF - - IF 输入.flag = "3" - QUERY - SELECT - shiftOrder.*, - workprocedure.workprocedure_name, - material.material_code, - material.material_name, - material.material_spec - FROM - MPS_BD_ProduceShiftOrder shiftOrder - left join PDM_BI_WorkProcedure workprocedure on workprocedure.workprocedure_id = shiftOrder.workprocedure_id - left join md_me_materialbase material on material.material_id = shiftOrder.material_id - WHERE - shiftOrder.is_delete = '0' and shiftOrder.order_status in ('01', '02', '03') - and shiftOrder.workprocedure_id in 输入.workprocedure_ids - order by - shiftOrder.update_time desc - ENDSELECT - ENDQUERY - ENDIF - - IF 输入.flag = "4" - QUERY - SELECT - personDevice.*, - device.device_code, - device.device_name - FROM - PDM_BI_PersonCorrDevice personDevice - LEFT JOIN em_bi_deviceinfo device ON personDevice.device_id = device.device_id - WHERE - device.is_delete = '0' and personDevice.jockey_id = 输入.jockey_id and device.workprocedure_id = 输入.workprocedure_id - ENDSELECT - ENDQUERY - ENDIF - - IF 输入.flag = "5" - QUERY - SELECT - record.*, - device.device_code, - device.device_name, - user.person_name - FROM - MPS_BD_MacOperateRecord record - LEFT JOIN em_bi_deviceinfo device ON record.device_id = device.device_id - LEFT JOIN sys_user user ON user.user_id = record.jockey_id - WHERE - record.produceorder_id = 输入.produceorder_id - order by - record.operatetime_start - ENDSELECT - ENDQUERY - ENDIF - diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/mps/wql/MPS_Personcorrdevice001.wql b/lms/nladmin-system/src/main/java/org/nl/wms/mps/wql/MPS_Personcorrdevice001.wql deleted file mode 100644 index edb5ac9a0..000000000 --- a/lms/nladmin-system/src/main/java/org/nl/wms/mps/wql/MPS_Personcorrdevice001.wql +++ /dev/null @@ -1,130 +0,0 @@ -[交易说明] - 交易名： 人员设备维护查询 - 所属模块： - 功能简述： - 版权所有： - 表引用： - 版本经历： - -[数据库] - --指定数据库，为空采用默认值，默认为db.properties中列出的第一个库 - -[IO定义] - ################################################# - ## 表字段对应输入参数 - ################################################# - 输入.flag TYPEAS s_string - 输入.search TYPEAS s_string - 输入.user_id TYPEAS s_string - 输入.device_id TYPEAS s_string - - -[临时表] - --这边列出来的临时表就会在运行期动态创建 - -[临时变量] - --所有中间过程变量均可在此处定义 - -[业务过程] - - ########################################## - # 1、输入输出检查 # - ########################################## - - - ########################################## - # 2、主过程前处理 # - ########################################## - - - ########################################## - # 3、业务主过程 # - ########################################## - - IF 输入.flag = "1" - PAGEQUERY - SELECT - view_person.* - FROM - ( - SELECT - personDevice.*, - user.* - FROM - PDM_BI_PersonCorrDevice personDevice - LEFT JOIN sys_user user ON personDevice.jockey_id = user.user_id - WHERE - user.is_used = '1' - GROUP BY - personDevice.jockey_id - ) view_person - where - 1 = 1 - OPTION 输入.search <> "" - (view_person.username like 输入.search or - view_person.person_name like 输入.search or - view_person.phone like 输入.search) - ENDOPTION - ENDSELECT - ENDPAGEQUERY - ENDIF - - IF 输入.flag = "2" - QUERY - SELECT - personDevice.* , - device.device_code, - device.device_name, - item.item_code, - item.item_name - FROM - PDM_BI_PersonCorrDevice personDevice - LEFT JOIN sys_user user ON personDevice.jockey_id = user.user_id - LEFT JOIN em_bi_deviceinfo device ON personDevice.device_id = device.device_id - left join PDM_BI_DeviceItemValue deviceValue on deviceValue.device_id = device.device_id - left join PDM_BI_DeviceItem item on item.item_id = deviceValue.item_id - where - personDevice.jockey_id = 输入.user_id - GROUP BY - item.item_code - ENDSELECT - ENDQUERY - ENDIF - - IF 输入.flag = "3" - PAGEQUERY - SELECT - personDevice.*, - device.device_code, - device.device_name, - work.workprocedure_code, - work.workprocedure_name - FROM - PDM_BI_PersonCorrDevice personDevice - left join em_bi_deviceinfo device on device.device_id = personDevice.device_id - left join PDM_BI_WorkProcedure work on device.workprocedure_id = work.workprocedure_id - where - personDevice.jockey_id = 输入.user_id and (personDevice.device_id is not null or personDevice.device_id != "" ) - ENDSELECT - ENDPAGEQUERY - ENDIF - - IF 输入.flag = "4" - QUERY - SELECT - deviceItemValue.device_id, - deviceItemValue.item_id, - deviceItemValue.item_value, - item.item_code - FROM - PDM_BI_DeviceItemValue deviceItemValue - LEFT JOIN em_bi_deviceinfo device ON deviceItemValue.device_id = device.device_id - LEFT JOIN PDM_BI_DeviceItem item ON deviceItemValue.item_id = item.item_id - where - deviceItemValue.device_id = 输入.device_id - ENDSELECT - ENDQUERY - ENDIF - - - diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/mps/wql/MPS_Teamcorrperson001.wql b/lms/nladmin-system/src/main/java/org/nl/wms/mps/wql/MPS_Teamcorrperson001.wql deleted file mode 100644 index b6c862b8d..000000000 --- a/lms/nladmin-system/src/main/java/org/nl/wms/mps/wql/MPS_Teamcorrperson001.wql +++ /dev/null @@ -1,58 +0,0 @@ -[交易说明] - 交易名： 班组人员维护查询 - 所属模块： - 功能简述： - 版权所有： - 表引用： - 版本经历： - -[数据库] - --指定数据库，为空采用默认值，默认为db.properties中列出的第一个库 - -[IO定义] - ################################################# - ## 表字段对应输入参数 - ################################################# - 输入.flag TYPEAS s_string - 输入.team_id TYPEAS s_string - - -[临时表] - --这边列出来的临时表就会在运行期动态创建 - -[临时变量] - --所有中间过程变量均可在此处定义 - -[业务过程] - - ########################################## - # 1、输入输出检查 # - ########################################## - - - ########################################## - # 2、主过程前处理 # - ########################################## - - - ########################################## - # 3、业务主过程 # - ########################################## - - IF 输入.flag = "1" - PAGEQUERY - SELECT - teamPerson.*, - user.* - FROM - PDM_BI_TeamCorrPerson teamPerson - LEFT JOIN PDM_BI_WorkTeam team ON teamPerson.team_id = team.team_id - LEFT JOIN sys_user user ON teamPerson.jockey_id = user.user_id - WHERE - teamPerson.team_id = 输入.team_id - ENDSELECT - ENDPAGEQUERY - ENDIF - - - diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/BakingServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/BakingServiceImpl.java index ec81fa2c2..14cf26e98 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/BakingServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/BakingServiceImpl.java @@ -17,6 +17,7 @@ import org.nl.modules.wql.WQL; import org.nl.modules.wql.core.bean.WQLObject; import org.nl.modules.wql.util.SpringContextHolder; import org.nl.system.service.param.impl.SysParamServiceImpl; +import org.nl.wms.basedata.st.service.impl.UserAreaServiceImpl; import org.nl.wms.ext.acs.service.impl.WmsToAcsServiceImpl; import org.nl.wms.pda.mps.eum.RegionTypeEnum; import org.nl.wms.pda.mps.service.BakingService; @@ -64,6 +65,10 @@ public class BakingServiceImpl implements BakingService { String temperature_lose = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("temperature_lose").getValue(); + //获取人员对应的区域 + UserAreaServiceImpl userAreaService = new UserAreaServiceImpl(); + String in_area_id = userAreaService.getInArea(); + if (StrUtil.equals(option, "1")) { // 入箱 String container_name = whereJson.getString("container_name"); // 母卷号 @@ -89,16 +94,27 @@ public class BakingServiceImpl implements BakingService { } - if (ObjectUtil.isEmpty(container_name)) throw new BadRequestException("母卷号不能为空"); - if (ObjectUtil.isEmpty(temperature)) throw new BadRequestException("温度不能为空"); - if (ObjectUtil.isEmpty(hours)) throw new BadRequestException("时间不能为空"); - if (ObjectUtil.isEmpty(point_code1)) throw new BadRequestException("点位不能为空"); + if (ObjectUtil.isEmpty(container_name)) { + throw new BadRequestException("母卷号不能为空"); + } + if (ObjectUtil.isEmpty(temperature)) { + throw new BadRequestException("温度不能为空"); + } + if (ObjectUtil.isEmpty(hours)) { + throw new BadRequestException("时间不能为空"); + } + if (ObjectUtil.isEmpty(point_code1)) { + throw new BadRequestException("点位不能为空"); + } /* * 根据点位判断是 冷却区入烘箱还是暂存区入烘箱 */ JSONObject jsonPointZc = pointTab.query("point_code = '" + point_code1 + "'").uniqueResult(0); if (ObjectUtil.isNotEmpty(jsonPointZc)) { + if (!in_area_id.contains(jsonPointZc.getString("product_area"))){ + throw new BadRequestException("当前登录人员暂无【"+jsonPointZc.getString("product_area")+"】操作权限"); + } /* * 暂存区入烘箱 */ @@ -111,7 +127,9 @@ public class BakingServiceImpl implements BakingService { jsonMap.put("max_temperature", (NumberUtil.add(temperature, temperature_lose)).toString()); jsonMap.put("point_location", jsonPointZc.getString("point_location")); JSONObject jsonHotIvt = WQL.getWO("PDA_BAKING_01").addParamMap(jsonMap).process().uniqueResult(0); - if (ObjectUtil.isEmpty(jsonHotIvt)) throw new BadRequestException("烘烤区没有合适温度的空位！"); + if (ObjectUtil.isEmpty(jsonHotIvt)) { + throw new BadRequestException("烘烤区没有合适温度的空位！"); + } // 2.创建暂存位 --> 烘烤区任务 JSONObject param = new JSONObject(); param.put("type", "2"); // 1- 冷却区入烘箱 2- 暂存位入烘箱 @@ -149,12 +167,17 @@ public class BakingServiceImpl implements BakingService { // 1.根据冷却区此母卷的点位找到对应的暂存区、找到空位 // JSONObject jsonCoolIvt = coolIvtTab.query("container_name ='" + container_name + "' and is_used = '1' and full_point_status = '02' and cool_ivt_status = '01'").uniqueResult(0); JSONObject jsonCoolIvt = coolIvtTab.query("full_point_code = '" + point_code1 + "' and is_used = '1'").uniqueResult(0); - if (ObjectUtil.isEmpty(jsonCoolIvt)) throw new BadRequestException("请扫描正确的冷却区或对接点位！"); + if (ObjectUtil.isEmpty(jsonCoolIvt)) { + throw new BadRequestException("请扫描正确的冷却区或对接点位！"); + } String product_area = jsonCoolIvt.getString("product_area"); // 生产区域 String point_location = jsonCoolIvt.getString("point_location"); // 位置 String reging_id = ""; + if (!in_area_id.contains(product_area)){ + throw new BadRequestException("当前登录人员暂无【"+product_area+"】操作权限"); + } switch (product_area) { case "A1": reging_id = RegionTypeEnum.A_HKZC.getId(); @@ -196,7 +219,9 @@ public class BakingServiceImpl implements BakingService { jsonMap.put("max_temperature", NumberUtil.add(temperature, temperature_lose) + ""); jsonMap.put("point_location", map.getString("point_location")); JSONObject jsonHotIvt = WQL.getWO("PDA_BAKING_01").addParamMap(jsonMap).process().uniqueResult(0); - if (ObjectUtil.isEmpty(jsonHotIvt)) throw new BadRequestException("烘烤区没有合适温度的空位！"); + if (ObjectUtil.isEmpty(jsonHotIvt)) { + throw new BadRequestException("烘烤区没有合适温度的空位！"); + } // 3.创建冷却区 --> 烘烤区任务 JSONObject param = new JSONObject(); @@ -215,7 +240,9 @@ public class BakingServiceImpl implements BakingService { // 4.插入烘箱区出入主表 JSONObject jsonRaw = rawTab.query("container_name = '" + container_name + "' and is_delete = '0'").uniqueResult(0); JSONObject jsonMater = materTab.query("material_code = '" + jsonRaw.getString("product_name") + "'").uniqueResult(0); - if (ObjectUtil.isEmpty(jsonMater)) throw new BadRequestException("物料基础信息中无此物料！"); + if (ObjectUtil.isEmpty(jsonMater)) { + throw new BadRequestException("物料基础信息中无此物料！"); + } JSONObject hotParam = new JSONObject(); hotParam.put("container_name", container_name); @@ -263,9 +290,13 @@ public class BakingServiceImpl implements BakingService { } else if (StrUtil.equals(option, "2")) { // 出箱 String point_code1 = whereJson.getString("point_code"); - if (ObjectUtil.isEmpty(point_code1)) throw new BadRequestException("点位不能为空"); + if (ObjectUtil.isEmpty(point_code1)) { + throw new BadRequestException("点位不能为空"); + } JSONObject jsonHotIvt = hosIvtTab.query("point_code = '" + point_code1 + "'").uniqueResult(0); - if (ObjectUtil.isEmpty(jsonHotIvt)) throw new BadRequestException("烘烤区域无此点位！"); + if (ObjectUtil.isEmpty(jsonHotIvt)) { + throw new BadRequestException("烘烤区域无此点位！"); + } //查询该点位是否存在未完成的任务 boolean have_task = new CutConveyorTask().isSingleTask(point_code1); @@ -277,6 +308,9 @@ public class BakingServiceImpl implements BakingService { } // 1.查询暂存位有没有空位 String product_area = jsonHotIvt.getString("product_area"); + if (!in_area_id.contains(product_area)){ + throw new BadRequestException("当前登录人员暂无【"+product_area+"】操作权限"); + } String reging_id = ""; switch (product_area) { case "A1": @@ -300,7 +334,9 @@ public class BakingServiceImpl implements BakingService { map.put("point_type", "5"); JSONArray pointArr = WQL.getWO("PDA_OVENINANDOUT_01").addParamMap(map).process().getResultJSONArray(0); - if (ObjectUtil.isEmpty(pointArr)) throw new BadRequestException("没有无货且没有任务的点位类型为出箱的烘箱对接位！"); + if (ObjectUtil.isEmpty(pointArr)) { + throw new BadRequestException("没有无货且没有任务的点位类型为出箱的烘箱对接位！"); + } // 2.判断暂存位是否有任务：找到无任务的暂存位 String point_code2 = ""; @@ -317,7 +353,9 @@ public class BakingServiceImpl implements BakingService { break; } } - if (ObjectUtil.isEmpty(point_code2)) throw new BadRequestException("没有无货且没有任务的点位类型为出箱的烘箱对接位！"); + if (ObjectUtil.isEmpty(point_code2)) { + throw new BadRequestException("没有无货且没有任务的点位类型为出箱的烘箱对接位！"); + } // 3.创建任务 JSONObject param = new JSONObject(); param.put("point_code1", point_code1); @@ -332,7 +370,9 @@ public class BakingServiceImpl implements BakingService { JSONObject jsonRaw = rawTab.query("container_name = '" + jsonHotIvt.getString("container_name") + "' and is_delete = '0'").uniqueResult(0); JSONObject jsonMater = materTab.query("material_code = '" + jsonRaw.getString("product_name") + "'").uniqueResult(0); - if (ObjectUtil.isEmpty(jsonMater)) throw new BadRequestException("物料基础信息中无此物料！"); + if (ObjectUtil.isEmpty(jsonMater)) { + throw new BadRequestException("物料基础信息中无此物料！"); + } JSONObject hotParam = new JSONObject(); hotParam.put("container_name", jsonRaw.getString("container_name")); @@ -369,8 +409,16 @@ public class BakingServiceImpl implements BakingService { String point_code1 = whereJson.getString("point_code"); // 暂存位：起点 String container_name = whereJson.getString("container_name"); // 母卷号 - if (ObjectUtil.isEmpty(point_code1)) throw new BadRequestException("点位不能为空"); - if (ObjectUtil.isEmpty(container_name)) throw new BadRequestException("母卷号不能为空"); + //获取人员对应的区域 + UserAreaServiceImpl userAreaService = new UserAreaServiceImpl(); + String in_area_id = userAreaService.getInArea(); + + if (ObjectUtil.isEmpty(point_code1)) { + throw new BadRequestException("点位不能为空"); + } + if (ObjectUtil.isEmpty(container_name)) { + throw new BadRequestException("母卷号不能为空"); + } //校验该设备是否启用，且母卷MES是否请求烘烤 //查询该母卷号、设备号对应的生箔工单 @@ -391,8 +439,13 @@ public class BakingServiceImpl implements BakingService { // 1.获取此暂存位的生产区域和上下位置 JSONObject jsonPoint = pointTab.query("point_code = '" + point_code1 + "'").uniqueResult(0); - if (ObjectUtil.isEmpty(jsonPoint)) throw new BadRequestException("请扫描点位类型为出箱的烘箱对接位！"); + if (ObjectUtil.isEmpty(jsonPoint)) { + throw new BadRequestException("请扫描点位类型为出箱的烘箱对接位！"); + } + if (!in_area_id.contains(jsonPoint.getString("product_area"))){ + throw new BadRequestException("当前登录人员暂无【"+jsonPoint.getString("product_area")+"】操作权限"); + } // 2.找冷却区空货位 JSONObject map = new JSONObject(); map.put("flag", "2"); @@ -402,11 +455,17 @@ public class BakingServiceImpl implements BakingService { JSONObject jsonCooIvt = WQL.getWO("PDA_OVENINANDOUT_01").addParamMap(map).process().uniqueResult(0); // 如果为空 if (ObjectUtil.isEmpty(jsonCooIvt)) { - if (StrUtil.equals(jsonPoint.getString("point_location"), "0")) map.put("point_location", "1"); - if (StrUtil.equals(jsonPoint.getString("point_location"), "1")) map.put("point_location", "0"); + if (StrUtil.equals(jsonPoint.getString("point_location"), "0")) { + map.put("point_location", "1"); + } + if (StrUtil.equals(jsonPoint.getString("point_location"), "1")) { + map.put("point_location", "0"); + } jsonCooIvt = WQL.getWO("PDA_OVENINANDOUT_01").addParamMap(map).process().uniqueResult(0); } - if (ObjectUtil.isEmpty(jsonCooIvt)) throw new BadRequestException("冷却区空位不足"); + if (ObjectUtil.isEmpty(jsonCooIvt)) { + throw new BadRequestException("冷却区空位不足"); + } // 3.创建任务 JSONObject param = new JSONObject(); @@ -435,7 +494,9 @@ public class BakingServiceImpl implements BakingService { JSONObject jsonRaw = rawTab.query("container_name = '" + container_name + "' and is_delete = '0'").uniqueResult(0); JSONObject jsonMater = materTab.query("material_code = '" + jsonRaw.getString("product_name") + "'").uniqueResult(0); - if (ObjectUtil.isEmpty(jsonMater)) throw new BadRequestException("物料基础信息中无此物料！"); + if (ObjectUtil.isEmpty(jsonMater)) { + throw new BadRequestException("物料基础信息中无此物料！"); + } JSONObject jsonCool = new JSONObject(); jsonCool.put("iostorinv_id", IdUtil.getSnowflake(1, 1).nextId()); @@ -540,17 +601,33 @@ public class BakingServiceImpl implements BakingService { return result; } + //获取人员对应的区域 + UserAreaServiceImpl userAreaService = new UserAreaServiceImpl(); + String in_area_id = userAreaService.getInArea(); + JSONObject jsonCool = coolIvtTab.query("full_point_code = '" + point_code + "'").uniqueResult(0); if (ObjectUtil.isNotEmpty(jsonCool) && ObjectUtil.isNotEmpty(jsonCool.getString("container_name"))) { json.put("container_name", jsonCool.getString("container_name")); + String product_area = jsonCool.getString("product_area"); + if (!in_area_id.contains(product_area)){ + throw new BadRequestException("当前登录人员暂无【"+product_area+"】操作权限"); + } } else { JSONObject jsonHot = hotIvtTab.query("point_code = '" + point_code + "'").uniqueResult(0); if (ObjectUtil.isNotEmpty(jsonHot) && ObjectUtil.isNotEmpty(jsonHot.getString("container_name"))) { json.put("container_name", jsonHot.getString("container_name")); + String product_area = jsonHot.getString("product_area"); + if (!in_area_id.contains(product_area)){ + throw new BadRequestException("当前登录人员暂无【"+product_area+"】操作权限"); + } } else { JSONObject jsonPoint = pointIvtTab.query("point_code = '" + point_code + "'").uniqueResult(0); if (ObjectUtil.isNotEmpty(jsonPoint) && ObjectUtil.isNotEmpty(jsonPoint.getString("material_code"))) { json.put("container_name", jsonPoint.getString("material_code")); + String product_area = jsonPoint.getString("product_area"); + if (!in_area_id.contains(product_area)){ + throw new BadRequestException("当前登录人员暂无【"+product_area+"】操作权限"); + } } else { if (ObjectUtil.isEmpty(jsonCool) && ObjectUtil.isEmpty(jsonHot) && ObjectUtil.isEmpty(jsonPoint)) { throw new BadRequestException("请扫描冷却区、对接位或者烘箱的点位进行操作！"); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/CasingServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/CasingServiceImpl.java index 709f18a28..51cf237b2 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/CasingServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/CasingServiceImpl.java @@ -12,6 +12,7 @@ import org.nl.common.utils.SecurityUtils; import org.nl.modules.wql.WQL; import org.nl.modules.wql.core.bean.WQLObject; import org.nl.modules.wql.core.content.HttpContext; +import org.nl.wms.basedata.st.service.impl.UserAreaServiceImpl; import org.nl.wms.ext.acs.service.impl.WmsToAcsServiceImpl; import org.nl.wms.ext.mes.service.LmsToMesService; import org.nl.wms.pda.mps.service.BakingService; @@ -49,6 +50,12 @@ public class CasingServiceImpl implements CasingService { if (StrUtil.isNotEmpty(container_name)) { map.put("container_name", container_name); } + //获取人员对应的区域 + UserAreaServiceImpl userAreaService = new UserAreaServiceImpl(); + String in_area_id = userAreaService.getInArea(); + if (ObjectUtil.isNotEmpty(in_area_id)) { + map.put("in_area_id", in_area_id); + } JSONObject rows = WQL.getWO("PDA_02").addParamMap(map).pageQuery(ctx, "container_name"); JSONObject jo = new JSONObject(); jo.put("data", rows.getJSONArray("content")); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/FeedingServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/FeedingServiceImpl.java index 9629fbe20..74934f55a 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/FeedingServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/FeedingServiceImpl.java @@ -14,6 +14,7 @@ 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.core.content.HttpContext; +import org.nl.wms.basedata.st.service.impl.UserAreaServiceImpl; import org.nl.wms.ext.mes.service.LmsToMesService; import org.nl.wms.pda.mps.service.CasingService; import org.nl.wms.pda.mps.service.FeedingService; @@ -50,6 +51,12 @@ public class FeedingServiceImpl implements FeedingService { if (StrUtil.isNotEmpty(source_container_name)) { map.put("source_container_name", source_container_name); } + //获取人员对应的区域 + UserAreaServiceImpl userAreaService = new UserAreaServiceImpl(); + String in_area_id = userAreaService.getInArea(); + if (ObjectUtil.isNotEmpty(in_area_id)) { + map.put("in_area_id", in_area_id); + } JSONObject rows = WQL.getWO("PDA_02").addParamMap(map).pageQuery(ctx, "container_name"); JSONObject jo = new JSONObject(); jo.put("data", rows.getJSONArray("content")); @@ -227,6 +234,13 @@ public class FeedingServiceImpl implements FeedingService { if (ObjectUtil.isEmpty(cool_jo)) { throw new BadRequestException("请输入或者扫描冷却区满轴位的点位！"); + }else { + //获取人员对应的区域 + UserAreaServiceImpl userAreaService = new UserAreaServiceImpl(); + String in_area_id = userAreaService.getInArea(); + if (!in_area_id.contains(cool_jo.getString("product_area"))){ + throw new BadRequestException("当前登录人员暂无【"+cool_jo.getString("product_area")+"】操作权限"); + } } if (!StrUtil.equals(cool_jo.getString("full_point_status"), "02")) { @@ -253,6 +267,13 @@ public class FeedingServiceImpl implements FeedingService { if (ObjectUtil.isEmpty(cool_jo)) { throw new BadRequestException("请输入或者扫描冷却区满轴位的点位做为起点！"); + }else { + //获取人员对应的区域 + UserAreaServiceImpl userAreaService = new UserAreaServiceImpl(); + String in_area_id = userAreaService.getInArea(); + if (!in_area_id.contains(cool_jo.getString("product_area"))){ + throw new BadRequestException("当前登录人员暂无【"+cool_jo.getString("product_area")+"】操作权限"); + } } if (!StrUtil.equals(cool_jo.getString("full_point_status"), "02")) { diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/InServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/InServiceImpl.java index 66057ab7a..7e3ad16b5 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/InServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/InServiceImpl.java @@ -9,6 +9,7 @@ import lombok.extern.slf4j.Slf4j; import org.nl.modules.common.exception.BadRequestException; import org.nl.modules.wql.WQL; import org.nl.modules.wql.core.bean.WQLObject; +import org.nl.wms.basedata.st.service.impl.UserAreaServiceImpl; import org.nl.wms.pda.mps.service.InService; import org.nl.wms.pda.mps.service.OutService; import org.nl.wms.sch.manage.TaskStatusEnum; @@ -39,6 +40,12 @@ public class InServiceImpl implements InService { if (StrUtil.isNotEmpty(device_code)) { map.put("device_code", device_code); } + //获取人员对应的区域 + UserAreaServiceImpl userAreaService = new UserAreaServiceImpl(); + String in_area_id = userAreaService.getInArea(); + if (ObjectUtil.isNotEmpty(in_area_id)) { + map.put("in_area_id", in_area_id); + } JSONArray rows = WQL.getWO("PDA_02").addParamMap(map).process().getResultJSONArray(0); JSONObject jo = new JSONObject(); jo.put("data", rows); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/OutServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/OutServiceImpl.java index 013b94965..fd52f3860 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/OutServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/OutServiceImpl.java @@ -10,6 +10,7 @@ import org.checkerframework.checker.units.qual.K; import org.nl.modules.common.exception.BadRequestException; import org.nl.modules.wql.WQL; import org.nl.modules.wql.core.bean.WQLObject; +import org.nl.wms.basedata.st.service.impl.UserAreaServiceImpl; import org.nl.wms.pda.mps.service.OutService; import org.nl.wms.pda.mps.service.ShippingService; import org.nl.wms.sch.manage.TaskStatusEnum; @@ -40,6 +41,12 @@ public class OutServiceImpl implements OutService { if (StrUtil.isNotEmpty(device_code)) { map.put("device_code", device_code); } + //获取人员对应的区域 + UserAreaServiceImpl userAreaService = new UserAreaServiceImpl(); + String in_area_id = userAreaService.getInArea(); + if (ObjectUtil.isNotEmpty(in_area_id)) { + map.put("in_area_id", in_area_id); + } JSONArray rows = WQL.getWO("PDA_02").addParamMap(map).process().getResultJSONArray(0); JSONObject jo = new JSONObject(); jo.put("data", rows); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/PaperTubeServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/PaperTubeServiceImpl.java index 4e65e62cc..0249f58ca 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/PaperTubeServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/PaperTubeServiceImpl.java @@ -17,6 +17,7 @@ import org.nl.modules.wql.WQL; import org.nl.modules.wql.core.bean.WQLObject; import org.nl.modules.wql.util.SpringContextHolder; import org.nl.system.service.param.impl.SysParamServiceImpl; +import org.nl.wms.basedata.st.service.impl.UserAreaServiceImpl; import org.nl.wms.ext.acs.service.WmsToAcsService; import org.nl.wms.ext.acs.service.impl.WmsToAcsServiceImpl; import org.nl.wms.pda.mps.eum.RegionTypeEnum; @@ -56,6 +57,9 @@ public class PaperTubeServiceImpl implements PaperTubeService { @Override public JSONObject PaperDeviceOperate(JSONObject whereJson) { String option = whereJson.getString("option"); + //获取人员对应的区域 + UserAreaServiceImpl userAreaService = new UserAreaServiceImpl(); + String in_area_id = userAreaService.getInArea(); if ("1".equals(option)) { String device_code = whereJson.getString("device_code"); String material_code = whereJson.getString("material_code"); @@ -74,6 +78,9 @@ public class PaperTubeServiceImpl implements PaperTubeService { jo.put("material_code", material_code); jo.put("product_area", point_jo.getString("product_area")); jo.put("type", "1"); + if (!in_area_id.contains(point_jo.getString("product_area"))) { + throw new BadRequestException("当前登录人员暂无【"+point_jo.getString("product_area")+"】操作权限"); + } wmsToAcsService.PaperTubeAction(jo); } if ("2".equals(option)) { @@ -99,6 +106,9 @@ public class PaperTubeServiceImpl implements PaperTubeService { jo.put("product_area", point_jo.getString("product_area")); jo.put("type", "2"); jo.put("qty", qty); + if (!in_area_id.contains(point_jo.getString("product_area"))) { + throw new BadRequestException("当前登录人员暂无【"+point_jo.getString("product_area")+"】操作权限"); + } wmsToAcsService.PaperTubeAction(jo); } JSONObject result = new JSONObject(); @@ -112,10 +122,12 @@ public class PaperTubeServiceImpl implements PaperTubeService { HashMap map = new HashMap(); if (StrUtil.isNotEmpty(product_area)) { map.put("product_area", product_area); + }else { + map.put("product_area", "A1"); } map.put("flag", "22"); JSONArray rows = WQL.getWO("PDA_02").addParamMap(map).process().getResultJSONArray(0); - JSONObject device_jo = wmsToAcsService.getPointStatus(rows); + JSONObject device_jo = wmsToAcsService.getHotPointStatus(rows); JSONArray de_rows = new JSONArray(); if (device_jo.containsKey("data")) { JSONArray ma_rows = device_jo.getJSONArray("data"); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/RawFoilServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/RawFoilServiceImpl.java index e4d6f3a34..af26e4deb 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/RawFoilServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/RawFoilServiceImpl.java @@ -16,6 +16,7 @@ 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.core.content.HttpContext; +import org.nl.wms.basedata.st.service.impl.UserAreaServiceImpl; import org.nl.wms.ext.acs.service.AcsToWmsService; import org.nl.wms.ext.acs.service.impl.WmsToAcsServiceImpl; import org.nl.wms.pda.mps.service.RawFoilService; @@ -51,12 +52,17 @@ public class RawFoilServiceImpl implements RawFoilService { String container_name = whereJson.getString("container_name"); String product_area = whereJson.getString("product_area"); + //获取人员对应的区域 + UserAreaServiceImpl userAreaService = new UserAreaServiceImpl(); + String in_area_id = userAreaService.getInArea(); + JSONArray resultArr = new JSONArray(); JSONObject map = new JSONObject(); map.put("flag", "4"); map.put("point_code", point_code); map.put("container_name", container_name); map.put("product_area", product_area); + if (ObjectUtil.isNotEmpty(in_area_id)) map.put("in_area_id", in_area_id); /*// 如果都为空则默认区域为 A1 if (ObjectUtil.isEmpty(point_code) && ObjectUtil.isEmpty(container_name) && ObjectUtil.isEmpty(product_area)) { @@ -122,6 +128,10 @@ public class RawFoilServiceImpl implements RawFoilService { map.put("flag", "5"); map.put("point_code", whereJson.getString("point_code")); map.put("container_name", whereJson.getString("container_name")); + //获取人员对应的区域 + UserAreaServiceImpl userAreaService = new UserAreaServiceImpl(); + String in_area_id = userAreaService.getInArea(); + if (ObjectUtil.isNotEmpty(in_area_id)) map.put("in_area_id", in_area_id); JSONObject resultJSONArray = WQL.getWO("PDA_RAWFOIL_01").addParamMap(map).pageQuery(ctx, "container_name"); JSONObject jo = new JSONObject(); jo.put("data", resultJSONArray.getJSONArray("content")); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/ShippingServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/ShippingServiceImpl.java index 1dec44e61..472e43610 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/ShippingServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/ShippingServiceImpl.java @@ -9,6 +9,7 @@ import lombok.extern.slf4j.Slf4j; import org.nl.modules.common.exception.BadRequestException; import org.nl.modules.wql.WQL; import org.nl.modules.wql.core.bean.WQLObject; +import org.nl.wms.basedata.st.service.impl.UserAreaServiceImpl; import org.nl.wms.ext.mes.service.LmsToMesService; import org.nl.wms.pda.mps.service.CasingService; import org.nl.wms.pda.mps.service.ShippingService; @@ -42,6 +43,12 @@ public class ShippingServiceImpl implements ShippingService { if (StrUtil.isNotEmpty(device_code)) { map.put("device_code", device_code); } + //获取人员对应的区域 + UserAreaServiceImpl userAreaService = new UserAreaServiceImpl(); + String in_area_id = userAreaService.getInArea(); + if (ObjectUtil.isNotEmpty(in_area_id)) { + map.put("in_area_id", in_area_id); + } JSONArray rows = WQL.getWO("PDA_02").addParamMap(map).process().getResultJSONArray(0); JSONObject jo = new JSONObject(); jo.put("data", rows); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/wql/PDA_02.wql b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/wql/PDA_02.wql index 1ca69a678..2df32d967 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/wql/PDA_02.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/wql/PDA_02.wql @@ -29,7 +29,8 @@ 输入.find_type TYPEAS s_string 输入.point_code1 TYPEAS s_string 输入.point_code2 TYPEAS s_string - + 输入.point_code2 TYPEAS s_string + 输入.in_area_id TYPEAS f_string [临时表] --这边列出来的临时表就会在运行期动态创建 @@ -98,6 +99,8 @@ is_child_ps_ok = 0 AND plan.is_delete = '0' + AND + ivt.product_area in 输入.in_area_id OPTION 输入.product_area <> "" ivt.product_area = 输入.product_area ENDOPTION @@ -270,6 +273,8 @@ is_child_ps_ok = 1 AND plan.is_delete = '0' + AND + ivt.product_area in 输入.in_area_id OPTION 输入.product_area <> "" ivt.product_area = 输入.product_area ENDOPTION @@ -299,6 +304,8 @@ is_child_ps_ok = 0 AND plan.is_delete = '0' + AND + ivt.product_area in 输入.in_area_id OPTION 输入.product_area <> "" ivt.product_area = 输入.product_area ENDOPTION @@ -385,6 +392,8 @@ AND del.is_used = '1' AND plan.is_delete = '0' + AND + del.product_area in 输入.in_area_id OPTION 输入.product_area <> "" del.product_area = 输入.product_area ENDOPTION @@ -478,6 +487,8 @@ is_parent_ok = 0 AND plan.is_delete = '0' + AND + ivt.product_area in 输入.in_area_id OPTION 输入.product_area <> "" ivt.product_area = 输入.product_area ENDOPTION @@ -788,7 +799,8 @@ IF 输入.flag = "22" QUERY SELECT - po.point_code AS device_code + po.point_code AS device_code, + po.product_area FROM sch_base_point po WHERE diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/wql/PDA_RAWFOIL_01.wql b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/wql/PDA_RAWFOIL_01.wql index f2409b310..0dd850a66 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/wql/PDA_RAWFOIL_01.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/wql/PDA_RAWFOIL_01.wql @@ -19,6 +19,7 @@ 输入.point_code TYPEAS s_string 输入.container_name TYPEAS s_string 输入.product_area TYPEAS s_string + 输入.in_area_id TYPEAS f_string [临时表] @@ -141,6 +142,7 @@ WHERE der.status = '01' AND der.is_delete = '0' + AND der.product_area in 输入.in_area_id OPTION 输入.point_code <> "" sb.point_code = 输入.point_code @@ -190,6 +192,7 @@ WHERE der.is_delete = '0' AND der.status <> '09' + AND der.product_area in 输入.in_area_id OPTION 输入.point_code <> "" der.resource_name = 输入.point_code diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/CoolInServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/CoolInServiceImpl.java index a3c0b8a22..f4cabe8d6 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/CoolInServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/CoolInServiceImpl.java @@ -16,6 +16,7 @@ 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.core.content.HttpContext; +import org.nl.wms.basedata.st.service.impl.UserAreaServiceImpl; import org.nl.wms.pda.st.service.CoolInService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -38,6 +39,12 @@ public class CoolInServiceImpl implements CoolInService { map.put("flag", "1"); if (ObjectUtil.isNotEmpty(container_name)) map.put("container_name", "%"+container_name+"%"); + //获取人员对应的区域 + UserAreaServiceImpl userAreaService = new UserAreaServiceImpl(); + String in_area_id = userAreaService.getInArea(); + if (ObjectUtil.isNotEmpty(in_area_id)) { + map.put("in_area_id", in_area_id); + } JSONObject jsonObject = WQL.getWO("PDA_COOLIN").addParamMap(map).pageQuery(ctx, "container_name"); JSONArray resultJSONArray = WQL.getWO("PDA_COOLIN").addParamMap(map).process().getResultJSONArray(0); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/CoolOutServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/CoolOutServiceImpl.java index c69e71fd9..48d93fc59 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/CoolOutServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/CoolOutServiceImpl.java @@ -13,6 +13,7 @@ import org.nl.modules.common.exception.BadRequestException; import org.nl.common.utils.SecurityUtils; import org.nl.modules.wql.WQL; import org.nl.modules.wql.core.bean.WQLObject; +import org.nl.wms.basedata.st.service.impl.UserAreaServiceImpl; import org.nl.wms.pda.st.service.CoolInService; import org.nl.wms.pda.st.service.CoolOutService; import org.springframework.stereotype.Service; @@ -35,6 +36,14 @@ public class CoolOutServiceImpl map.put("flag", "1"); map.put("container_name", whereJson.getString("container_name")); map.put("product_area", whereJson.getString("product_area")); + + //获取人员对应的区域 + UserAreaServiceImpl userAreaService = new UserAreaServiceImpl(); + String in_area_id = userAreaService.getInArea(); + if (ObjectUtil.isNotEmpty(in_area_id)) { + map.put("in_area_id", in_area_id); + } + JSONArray resultJSONArray = WQL.getWO("PDA_COOLOUT").addParamMap(map).process().getResultJSONArray(0); JSONObject jo = new JSONObject(); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/wql/PDA_COOLIN.wql b/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/wql/PDA_COOLIN.wql index 08f216728..510414591 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/wql/PDA_COOLIN.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/wql/PDA_COOLIN.wql @@ -17,6 +17,7 @@ 输入.point_code TYPEAS s_string 输入.container_name TYPEAS s_string 输入.task_type TYPEAS s_string + 输入.in_area_id TYPEAS f_string [临时表] @@ -72,7 +73,8 @@ LEFT JOIN st_ivt_sbpointivt ivt ON ivt.ext_code = der.resource_name WHERE der.is_delete = '0' - + AND + ivt.product_area in 输入.in_area_id OPTION 输入.container_name <> "" der.container_name like 输入.container_name ENDOPTION diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/wql/PDA_COOLOUT.wql b/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/wql/PDA_COOLOUT.wql index d7601a4ba..08aeb7caf 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/wql/PDA_COOLOUT.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/wql/PDA_COOLOUT.wql @@ -16,6 +16,7 @@ 输入.flag TYPEAS s_string 输入.product_area TYPEAS s_string 输入.container_name TYPEAS s_string + 输入.in_area_id TYPEAS f_string [临时表] @@ -63,7 +64,8 @@ LEFT JOIN ( SELECT * FROM ST_IVT_HotRegionIOMst WHERE 1 = 1 ORDER BY confirm_time DESC LIMIT 1 ) AS hotDtl2 ON hotDtl2.container_name = coolIvt.container_name WHERE coolIvt.full_point_status = '02' - + AND + coolIvt.product_area in 输入.in_area_id OPTION 输入.container_name <> "" coolIvt.container_name = 输入.container_name ENDOPTION diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/impl/CoolPointIvtServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/impl/CoolPointIvtServiceImpl.java index a7a01e112..56729f9fa 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/impl/CoolPointIvtServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/impl/CoolPointIvtServiceImpl.java @@ -16,6 +16,7 @@ import org.nl.common.utils.SecurityUtils; 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.basedata.st.service.impl.UserAreaServiceImpl; import org.nl.wms.pdm.ivt.service.CoolPointIvtService; import org.nl.wms.pdm.ivt.service.dto.CoolPointIvtDto; import org.springframework.data.domain.Pageable; @@ -38,6 +39,10 @@ public class CoolPointIvtServiceImpl implements CoolPointIvtService { @Override public Map queryAll(Map whereJson, Pageable page){ + + //获取人员对应的区域 + UserAreaServiceImpl userAreaService = new UserAreaServiceImpl(); + String in_area_id = userAreaService.getInArea(); HashMap map = new HashMap(); map.put("flag", "1"); if (whereJson.get("point_code")!=null) @@ -52,6 +57,7 @@ public class CoolPointIvtServiceImpl implements CoolPointIvtService { map.put("begin_time", whereJson.get("begin_time")); map.put("end_time", whereJson.get("end_time")); map.put("point_location",whereJson.get("point_location")); + if (ObjectUtil.isNotEmpty(in_area_id)) map.put("in_area_id", in_area_id); JSONObject json = WQL.getWO("ST_IVT_COOLPOINTIVT").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "product_area,point_code"); return json; } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/impl/CutPointIvtServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/impl/CutPointIvtServiceImpl.java index 7cbb6deb3..b1be37324 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/impl/CutPointIvtServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/impl/CutPointIvtServiceImpl.java @@ -15,6 +15,7 @@ import org.nl.common.utils.SecurityUtils; 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.basedata.st.service.impl.UserAreaServiceImpl; import org.nl.wms.pdm.ivt.service.CutPointIvtService; import org.nl.wms.pdm.ivt.service.dto.CutPointIvtDto; import org.springframework.data.domain.Pageable; @@ -37,14 +38,19 @@ public class CutPointIvtServiceImpl implements CutPointIvtService { @Override public Map queryAll(Map whereJson, Pageable page){ + //获取人员对应的区域 + UserAreaServiceImpl userAreaService = new UserAreaServiceImpl(); + String in_area_id = userAreaService.getInArea(); HashMap map = new HashMap(); map.put("flag", "1"); - if (whereJson.get("point_code")!=null) + if (whereJson.get("point_code")!=null) { map.put("point_code", "%" + whereJson.get("point_code") + "%"); + } map.put("full_point_status", whereJson.get("full_point_status")); map.put("empty_point_status", whereJson.get("empty_point_status")); map.put("product_area", whereJson.get("product_area")); map.put("is_used", whereJson.get("is_used")); + if (ObjectUtil.isNotEmpty(in_area_id)) map.put("in_area_id", in_area_id); JSONObject json = WQL.getWO("ST_IVT_CUTPOINTIVT").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "product_area,point_code"); return json; } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/impl/DeliveryPointIvtServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/impl/DeliveryPointIvtServiceImpl.java index d174496d2..22e320758 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/impl/DeliveryPointIvtServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/impl/DeliveryPointIvtServiceImpl.java @@ -15,6 +15,7 @@ import org.nl.common.utils.SecurityUtils; 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.basedata.st.service.impl.UserAreaServiceImpl; import org.nl.wms.pdm.ivt.service.DeliveryPointIvtService; import org.nl.wms.pdm.ivt.service.dto.DeliveryPointIvtDto; import org.springframework.data.domain.Pageable; @@ -36,6 +37,9 @@ public class DeliveryPointIvtServiceImpl implements DeliveryPointIvtService { @Override public Map queryAll(Map whereJson, Pageable page){ + //获取人员对应的区域 + UserAreaServiceImpl userAreaService = new UserAreaServiceImpl(); + String in_area_id = userAreaService.getInArea(); JSONObject map = new JSONObject(); map.put("flag", "1"); if (!ObjectUtil.isNull(whereJson.get("point_code"))) @@ -43,6 +47,7 @@ public Map queryAll(Map whereJson, Pageable page){ map.put("product_area", whereJson.get("product_area")); map.put("point_status", whereJson.get("point_status")); map.put("is_used", whereJson.get("is_used")); + if (ObjectUtil.isNotEmpty(in_area_id)) map.put("in_area_id", in_area_id); JSONObject json = WQL.getWO("ST_IVT_DELIVERYPOINTIVT").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "product_area,point_code"); return json; } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/impl/HotPointIvtServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/impl/HotPointIvtServiceImpl.java index ff0010adb..29a9cc9ed 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/impl/HotPointIvtServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/impl/HotPointIvtServiceImpl.java @@ -18,6 +18,7 @@ import org.nl.modules.wql.core.bean.WQLObject; import org.nl.modules.wql.util.SpringContextHolder; import org.nl.modules.wql.util.WqlUtil; import org.nl.system.service.param.impl.SysParamServiceImpl; +import org.nl.wms.basedata.st.service.impl.UserAreaServiceImpl; import org.nl.wms.ext.mes.service.impl.LmsToMesServiceImpl; import org.nl.wms.pdm.ivt.service.HotPointIvtService; import org.nl.wms.pdm.ivt.service.dto.HotPointIvtDto; @@ -41,10 +42,14 @@ public class HotPointIvtServiceImpl implements HotPointIvtService { @Override public Map queryAll(Map whereJson, Pageable page) { + //获取人员对应的区域 + UserAreaServiceImpl userAreaService = new UserAreaServiceImpl(); + String in_area_id = userAreaService.getInArea(); HashMap map = new HashMap(); map.put("flag", "1"); - if (whereJson.get("point_code") != null) + 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")); @@ -52,6 +57,7 @@ public class HotPointIvtServiceImpl implements HotPointIvtService { map.put("end_time", whereJson.get("end_time")); map.put("point_location", whereJson.get("point_location")); + if (ObjectUtil.isNotEmpty(in_area_id)) map.put("in_area_id", in_area_id); JSONObject json = WQL.getWO("ST_IVT_HOTPOINTIVT").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "product_area,point_code"); return json; } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/impl/SbPointIvtServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/impl/SbPointIvtServiceImpl.java index d2bbe9dbe..8c81face8 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/impl/SbPointIvtServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/impl/SbPointIvtServiceImpl.java @@ -15,6 +15,7 @@ import org.nl.common.utils.SecurityUtils; 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.basedata.st.service.impl.UserAreaServiceImpl; import org.nl.wms.pdm.ivt.service.SbPointIvtService; import org.nl.wms.pdm.ivt.service.dto.SbPointIvtDto; import org.springframework.data.domain.Pageable; @@ -36,12 +37,16 @@ public class SbPointIvtServiceImpl implements SbPointIvtService { @Override public Map queryAll(Map whereJson, Pageable page){ + //获取人员对应的区域 + UserAreaServiceImpl userAreaService = new UserAreaServiceImpl(); + String in_area_id = userAreaService.getInArea(); JSONObject map = new JSONObject(); map.put("flag", "1"); if (!ObjectUtil.isNull(whereJson.get("point_code"))) map.put("point_code", "%" + whereJson.get("point_code") + "%"); map.put("product_area", whereJson.get("product_area")); map.put("is_used", whereJson.get("is_used")); + if (ObjectUtil.isNotEmpty(in_area_id)) map.put("in_area_id", in_area_id); JSONObject json = WQL.getWO("ST_IVT_SBPOINTIVT").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "product_area,point_code"); return json; } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/rest/DeviceController.java b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/rest/DeviceController.java deleted file mode 100644 index bec71efc3..000000000 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/rest/DeviceController.java +++ /dev/null @@ -1,77 +0,0 @@ - -package org.nl.wms.pdm.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.pdm.service.DeviceService; -import org.nl.wms.pdm.service.dto.DeviceDto; -import org.springframework.data.domain.Pageable; -import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - -import java.util.Map; - -/** -* @author geng by -* @date 2022-05-25 -**/ -@RestController -@RequiredArgsConstructor -@Api(tags = "生产设备管理") -@RequestMapping("/api/device") -@Slf4j -public class DeviceController { - - private final DeviceService deviceService; - - @GetMapping - @Log("查询生产设备") - @ApiOperation("查询生产设备") - //@PreAuthorize("@el.check('device:list')") - public ResponseEntity query(@RequestParam Map whereJson, Pageable page){ - return new ResponseEntity<>(deviceService.queryAll(whereJson,page),HttpStatus.OK); - } - - @PostMapping - @Log("新增生产设备") - @ApiOperation("新增生产设备") - //@PreAuthorize("@el.check('device:add')") - public ResponseEntity create(@Validated @RequestBody DeviceDto dto){ - deviceService.create(dto); - return new ResponseEntity<>(HttpStatus.CREATED); - } - - @PutMapping - @Log("修改生产设备") - @ApiOperation("修改生产设备") - //@PreAuthorize("@el.check('device:edit')") - public ResponseEntity update(@Validated @RequestBody DeviceDto dto){ - deviceService.update(dto); - return new ResponseEntity<>(HttpStatus.NO_CONTENT); - } - - @Log("删除生产设备") - @ApiOperation("删除生产设备") - //@PreAuthorize("@el.check('device:del')") - @DeleteMapping - public ResponseEntity delete(@RequestBody Long[] ids) { - deviceService.deleteAll(ids); - return new ResponseEntity<>(HttpStatus.OK); - } - - @PutMapping("/changeActive") - @Log("修改点位启用状态") - @ApiOperation("修改点位启用状态") - public ResponseEntity changeActive(@RequestBody JSONObject json) { - deviceService.changeActive(json); - return new ResponseEntity<>(HttpStatus.NO_CONTENT); - } - -} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/rest/DeviceitemController.java b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/rest/DeviceitemController.java deleted file mode 100644 index 9e66e1c1e..000000000 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/rest/DeviceitemController.java +++ /dev/null @@ -1,68 +0,0 @@ - -package org.nl.wms.pdm.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.pdm.service.DeviceitemService; -import org.nl.wms.pdm.service.dto.DeviceitemDto; -import org.springframework.data.domain.Pageable; -import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - -import java.util.Map; - -/** -* @author geng by -* @date 2022-05-25 -**/ -@RestController -@RequiredArgsConstructor -@Api(tags = "生产设备扩展项管理") -@RequestMapping("/api/deviceitem") -@Slf4j -public class DeviceitemController { - - private final DeviceitemService deviceitemService; - - @GetMapping - @Log("查询生产设备扩展项") - @ApiOperation("查询生产设备扩展项") - //@PreAuthorize("@el.check('deviceitem:list')") - public ResponseEntity query(@RequestParam Map whereJson, Pageable page){ - return new ResponseEntity<>(deviceitemService.queryAll(whereJson,page),HttpStatus.OK); - } - - @PostMapping - @Log("新增生产设备扩展项") - @ApiOperation("新增生产设备扩展项") - //@PreAuthorize("@el.check('deviceitem:add')") - public ResponseEntity create(@Validated @RequestBody DeviceitemDto dto){ - deviceitemService.create(dto); - return new ResponseEntity<>(HttpStatus.CREATED); - } - - @PutMapping - @Log("修改生产设备扩展项") - @ApiOperation("修改生产设备扩展项") - //@PreAuthorize("@el.check('deviceitem:edit')") - public ResponseEntity update(@Validated @RequestBody DeviceitemDto dto){ - deviceitemService.update(dto); - return new ResponseEntity<>(HttpStatus.NO_CONTENT); - } - - @Log("删除生产设备扩展项") - @ApiOperation("删除生产设备扩展项") - //@PreAuthorize("@el.check('deviceitem:del')") - @DeleteMapping - public ResponseEntity delete(@RequestBody Long[] ids) { - deviceitemService.deleteAll(ids); - return new ResponseEntity<>(HttpStatus.OK); - } - -} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/rest/ProcessrouteController.java b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/rest/ProcessrouteController.java deleted file mode 100644 index e2b7be9d0..000000000 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/rest/ProcessrouteController.java +++ /dev/null @@ -1,96 +0,0 @@ - -package org.nl.wms.pdm.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.pdm.service.ProcessrouteService; -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; - -/** - * @author Zz - * @date 2022-03-21 - **/ -@RestController -@RequiredArgsConstructor -@Api(tags = "工艺路线管理") -@RequestMapping("/api/processroute") -@Slf4j -public class ProcessrouteController { - - private final ProcessrouteService processrouteService; - - @GetMapping - @Log("查询工艺路线") - @ApiOperation("查询工艺路线") - //@PreAuthorize("@el.check('processroute:list')") - public ResponseEntity query(@RequestParam Map whereJson, Pageable page) { - return new ResponseEntity<>(processrouteService.queryAll(whereJson, page), HttpStatus.OK); - } - - @PostMapping - @Log("新增工艺路线") - @ApiOperation("新增工艺路线") - //@PreAuthorize("@el.check('processroute:add')") - public ResponseEntity create(@RequestBody JSONObject json) { - processrouteService.create(json); - return new ResponseEntity<>(HttpStatus.CREATED); - } - - @PutMapping - @Log("修改工艺路线") - @ApiOperation("修改工艺路线") - //@PreAuthorize("@el.check('processroute:edit')") - public ResponseEntity update(@RequestBody JSONObject whereJson) { - processrouteService.update(whereJson); - return new ResponseEntity<>(HttpStatus.NO_CONTENT); - } - - @Log("删除工艺路线") - @ApiOperation("删除工艺路线") - //@PreAuthorize("@el.check('processroute:del')") - @DeleteMapping - public ResponseEntity delete(@RequestBody Long[] ids) { - processrouteService.deleteAll(ids); - return new ResponseEntity<>(HttpStatus.OK); - } - - @Log("获取工序") - @ApiOperation("获取工序") - @GetMapping("/getWorkList") - public ResponseEntity getWorkList() { - return new ResponseEntity<>(processrouteService.getWorkList(), HttpStatus.OK); - } - - @Log("获取明细") - @ApiOperation("获取明细") - @GetMapping("/getDtl") - public ResponseEntity getDtl(@RequestParam Map map) { - return new ResponseEntity<>(processrouteService.getDtl(map), HttpStatus.OK); - } - - @Log("提交") - @ApiOperation("提交") - @PutMapping("/submit") - public ResponseEntity submit(@RequestBody JSONObject whereJson) { - processrouteService.submit(whereJson); - return new ResponseEntity<>(HttpStatus.OK); - } - - @Log("取消提交") - @ApiOperation("取消提交") - @PutMapping("/CancelSubmit") - public ResponseEntity CancelSubmit(@RequestBody JSONObject whereJson) { - processrouteService.CancelSubmit(whereJson); - return new ResponseEntity<>(HttpStatus.OK); - } -} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/rest/WorkProcedureController.java b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/rest/WorkProcedureController.java deleted file mode 100644 index 289ff8eb7..000000000 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/rest/WorkProcedureController.java +++ /dev/null @@ -1,79 +0,0 @@ - -package org.nl.wms.pdm.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.pdm.service.WorkProcedureService; -import org.nl.wms.pdm.service.dto.WorkProcedureDto; -import org.springframework.data.domain.Pageable; -import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - -import java.util.Map; - -/** - * - * @author Zz - * @date 2021-12-19 - **/ -@RestController -@RequiredArgsConstructor -@Api(tags = "工序管理") -@RequestMapping("/api/workProcedure") -@Slf4j -public class WorkProcedureController { - - - private final WorkProcedureService workProcedureService; - - @GetMapping - @Log("查询工序") - @ApiOperation("查询工序") - //@PreAuthorize("@el.check('WorkProcedure:list')") - - public ResponseEntity query(@RequestParam Map whereJson, Pageable page) { - return new ResponseEntity<>(workProcedureService.queryAll(whereJson, page), HttpStatus.OK); - } - - @PostMapping - @Log("新增工序") - @ApiOperation("新增工序") - //@PreAuthorize("@el.check('WorkProcedure:add')") - - public ResponseEntity create(@Validated @RequestBody WorkProcedureDto dto) { - workProcedureService.create(dto); - return new ResponseEntity<>(HttpStatus.CREATED); - } - - @PutMapping - @Log("修改工序") - @ApiOperation("修改工序") - //@PreAuthorize("@el.check('WorkProcedure:edit')") - - public ResponseEntity update(@Validated @RequestBody WorkProcedureDto dto) { - workProcedureService.update(dto); - return new ResponseEntity<>(HttpStatus.NO_CONTENT); - } - - @Log("删除工序") - @ApiOperation("删除工序") - //@PreAuthorize("@el.check('WorkProcedure:del')") - @DeleteMapping - public ResponseEntity delete(@RequestBody Long[] ids) { - workProcedureService.deleteAll(ids); - return new ResponseEntity<>(HttpStatus.OK); - } - - @GetMapping("/downSelect") - @Log("查询工序下拉列表") - @ApiOperation("查询工序下拉列表") - public ResponseEntity downSelect() { - return new ResponseEntity<>(workProcedureService.downSelect(), HttpStatus.OK); - } -} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/DeviceService.java b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/DeviceService.java deleted file mode 100644 index 147b5b825..000000000 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/DeviceService.java +++ /dev/null @@ -1,68 +0,0 @@ - -package org.nl.wms.pdm.service; - -import com.alibaba.fastjson.JSONObject; -import org.nl.wms.pdm.service.dto.DeviceDto; -import org.springframework.data.domain.Pageable; - -import java.util.List; -import java.util.Map; - -/** -* @description 服务接口 -* @author geng by -* @date 2022-05-25 -**/ -public interface DeviceService { - - /** - * 查询数据分页 - * @param whereJson 条件 - * @param page 分页参数 - * @return Map - */ - Map queryAll(Map whereJson, Pageable page); - - /** - * 查询所有数据不分页 - * @param whereJson 条件参数 - * @return List - */ - List queryAll(Map whereJson); - - /** - * 根据ID查询 - * @param device_id ID - * @return Device - */ - DeviceDto findById(Long device_id); - - /** - * 根据编码查询 - * @param code code - * @return Device - */ - DeviceDto findByCode(String code); - - - /** - * 创建 - * @param dto / - */ - void create(DeviceDto dto); - - /** - * 编辑 - * @param dto / - */ - void update(DeviceDto dto); - - /** - * 多选删除 - * @param ids / - */ - void deleteAll(Long[] ids); - - - void changeActive(JSONObject json); -} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/DeviceitemService.java b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/DeviceitemService.java deleted file mode 100644 index 158aa1160..000000000 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/DeviceitemService.java +++ /dev/null @@ -1,65 +0,0 @@ - -package org.nl.wms.pdm.service; - -import org.nl.wms.pdm.service.dto.DeviceitemDto; -import org.springframework.data.domain.Pageable; - -import java.util.List; -import java.util.Map; - -/** -* @description 服务接口 -* @author geng by -* @date 2022-05-25 -**/ -public interface DeviceitemService { - - /** - * 查询数据分页 - * @param whereJson 条件 - * @param page 分页参数 - * @return Map - */ - Map queryAll(Map whereJson, Pageable page); - - /** - * 查询所有数据不分页 - * @param whereJson 条件参数 - * @return List - */ - List queryAll(Map whereJson); - - /** - * 根据ID查询 - * @param item_id ID - * @return Deviceitem - */ - DeviceitemDto findById(Long item_id); - - /** - * 根据编码查询 - * @param code code - * @return Deviceitem - */ - DeviceitemDto findByCode(String code); - - - /** - * 创建 - * @param dto / - */ - void create(DeviceitemDto dto); - - /** - * 编辑 - * @param dto / - */ - void update(DeviceitemDto dto); - - /** - * 多选删除 - * @param ids / - */ - void deleteAll(Long[] ids); - -} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/ProcessrouteService.java b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/ProcessrouteService.java deleted file mode 100644 index 81661a9c4..000000000 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/ProcessrouteService.java +++ /dev/null @@ -1,100 +0,0 @@ - -package org.nl.wms.pdm.service; - - -import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; -import org.nl.wms.pdm.service.dto.ProcessrouteDto; -import org.springframework.data.domain.Pageable; - -import java.util.List; -import java.util.Map; - -/** - * @author Zz - * @description 服务接口 - * @date 2022-03-21 - **/ -public interface ProcessrouteService { - - /** - * 查询数据分页 - * - * @param whereJson 条件 - * @param page 分页参数 - * @return Map - */ - Map queryAll(Map whereJson, Pageable page); - - /** - * 查询所有数据不分页 - * - * @param whereJson 条件参数 - * @return List - */ - List queryAll(Map whereJson); - - /** - * 根据ID查询 - * - * @param processroute_id ID - * @return Processroute - */ - ProcessrouteDto findById(String processroute_id); - - /** - * 根据编码查询 - * - * @param code code - * @return Processroute - */ - ProcessrouteDto findByCode(String code); - - - /** - * 创建 - * - * @param json / - */ - void create(JSONObject json); - - /** - * 编辑 - * - * @param whereJson / - */ - void update(JSONObject whereJson); - - /** - * 多选删除 - * - * @param ids / - */ - void deleteAll(Long[] ids); - - /** - * 获取工序 - */ - JSONArray getWorkList(); - - /** - * 获取明细 - * - * @param map / - */ - JSONArray getDtl(Map map); - - /** - * 提交 - * - * @param whereJson / - */ - void submit(JSONObject whereJson); - - /** - * 取消提交 - * - * @param whereJson / - */ - void CancelSubmit(JSONObject whereJson); -} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/WorkProcedureService.java b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/WorkProcedureService.java deleted file mode 100644 index 37dd76114..000000000 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/WorkProcedureService.java +++ /dev/null @@ -1,81 +0,0 @@ - -package org.nl.wms.pdm.service; - -import com.alibaba.fastjson.JSONArray; -import org.nl.wms.pdm.service.dto.WorkProcedureDto; -import org.springframework.data.domain.Pageable; - -import java.util.List; -import java.util.Map; - -/** - * @author ldjun - * @description 服务接口 - * @date 2021-12-19 - **/ -public interface WorkProcedureService { - /** - * 查询数据分页 - * - * @param whereJson 条件 - * @param page 分页参数 - * @return Map - */ - Map queryAll(Map whereJson, Pageable page); - - /** - * 查询所有数据不分页 - * - * @param whereJson 条件参数 - * @return List - */ - List queryAll(Map whereJson); - - /** - * 根据ID查询 - * - * @param workProcedure_id ID - * @return WorkProcedure - */ - WorkProcedureDto findById(Long workProcedure_id); - - /** - * 根据编码查询 - * - * @param code code - * @return WorkProcedure - */ - WorkProcedureDto findByCode(String code); - - - /** - * 创建 - * - * @param dto / - */ - void create(WorkProcedureDto dto); - - - /** - * 多选删除 - * - * @param ids / - */ - void deleteAll(Long[] ids); - - /** - * 编辑 - * - * @param dto / - */ - void update(WorkProcedureDto dto); - - - /** - * 获取下拉选列表 - * - * @return - */ - JSONArray downSelect(); - -} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/DeviceServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/DeviceServiceImpl.java deleted file mode 100644 index e1e308bf6..000000000 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/DeviceServiceImpl.java +++ /dev/null @@ -1,140 +0,0 @@ - -package org.nl.wms.pdm.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.JSON; -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.common.utils.SecurityUtils; -import org.nl.wms.pdm.service.DeviceService; -import org.nl.wms.pdm.service.dto.DeviceDto; -import org.nl.modules.wql.WQL; -import org.nl.modules.wql.core.bean.WQLObject; -import org.nl.modules.wql.util.WqlUtil; -import org.springframework.data.domain.Pageable; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.List; -import java.util.Map; - -/** - * @author geng by - * @description 服务实现 - * @date 2022-05-25 - **/ -@Service -@RequiredArgsConstructor -@Slf4j -public class DeviceServiceImpl implements DeviceService { - - @Override - public Map queryAll(Map whereJson, Pageable page) { - String search = MapUtil.getStr(whereJson, "search"); - JSONObject map = new JSONObject(); - map.put("flag", "1"); - if (!StrUtil.isEmpty(search)) { - map.put("search", "%" + search + "%"); - } - JSONObject json = WQL.getWO("PDM_BI_DEVICE01").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "device.create_time DESC"); - return json; - } - - @Override - public List queryAll(Map whereJson) { - WQLObject wo = WQLObject.getWQLObject("em_bi_deviceinfo"); - JSONArray arr = wo.query().getResultJSONArray(0); - if (ObjectUtil.isNotEmpty(arr)) return arr.toJavaList(DeviceDto.class); - return null; - } - - @Override - public DeviceDto findById(Long device_id) { - WQLObject wo = WQLObject.getWQLObject("em_bi_deviceinfo"); - JSONObject json = wo.query("device_id = '" + device_id + "'").uniqueResult(0); - if (ObjectUtil.isNotEmpty(json)) { - return json.toJavaObject(DeviceDto.class); - } - return null; - } - - @Override - public DeviceDto findByCode(String code) { - WQLObject wo = WQLObject.getWQLObject("em_bi_deviceinfo"); - JSONObject json = wo.query("device_code ='" + code + "'").uniqueResult(0); - if (ObjectUtil.isNotEmpty(json)) { - return json.toJavaObject(DeviceDto.class); - } - return null; - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void create(DeviceDto dto) { - String currentUserId = SecurityUtils.getCurrentUserId(); - String nickName = SecurityUtils.getCurrentNickName(); - String now = DateUtil.now(); - //编码唯一性校验 - String device_code = dto.getDevice_code(); - DeviceDto byCode = this.findByCode(device_code); - if (ObjectUtil.isNotEmpty(byCode)) throw new BadRequestException("编码已存在!"); - dto.setDevice_id(IdUtil.getSnowflake(1, 1).nextId()); - dto.setCreate_id(currentUserId); - dto.setCreate_name(nickName); - dto.setCreate_time(now); - - WQLObject wo = WQLObject.getWQLObject("em_bi_deviceinfo"); - JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto)); - wo.insert(json); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void update(DeviceDto dto) { - DeviceDto entity = this.findById(dto.getDevice_id()); - if (entity == null) throw new BadRequestException("被删除或无权限，操作失败!"); - - //编码唯一性校验 - WQLObject wo = WQLObject.getWQLObject("em_bi_deviceinfo"); - String where = "is_delete = '0' and device_code = '" + dto.getDevice_code() + "' and device_id != '" + dto.getDevice_id() + "'"; - - JSONObject jsonObject = wo.query(where).uniqueResult(0); - if (ObjectUtil.isNotEmpty(jsonObject)) { - throw new BadRequestException("编码已存在!"); - } - - - JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto)); - wo.update(json); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void deleteAll(Long[] ids) { - WQLObject wo = WQLObject.getWQLObject("em_bi_deviceinfo"); - WQLObject wo_value = WQLObject.getWQLObject("PDM_BI_DeviceItemValue"); - for (Long device_id : ids) { - wo.delete("device_id = '" + device_id + "'"); - wo_value.delete("device_id = '" + device_id + "'"); - } - } - - @Override - public void changeActive(JSONObject json) { - String is_used = "1"; - if (StrUtil.equals("1", json.getString("is_used"))) { - is_used = "0"; - } - json.put("is_used", is_used); - WQLObject.getWQLObject("em_bi_deviceinfo").update(json); - } - -} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/DeviceitemServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/DeviceitemServiceImpl.java deleted file mode 100644 index 37487382b..000000000 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/DeviceitemServiceImpl.java +++ /dev/null @@ -1,123 +0,0 @@ - -package org.nl.wms.pdm.service.impl; - - -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.JSON; -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.wms.pdm.service.DeviceitemService; -import org.nl.wms.pdm.service.dto.DeviceitemDto; -import org.nl.modules.wql.core.bean.ResultBean; -import org.nl.modules.wql.core.bean.WQLObject; -import org.nl.modules.wql.util.WqlUtil; -import org.springframework.data.domain.Pageable; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.List; -import java.util.Map; - -/** - * @author geng by - * @description 服务实现 - * @date 2022-05-25 - **/ -@Service -@RequiredArgsConstructor -@Slf4j -public class DeviceitemServiceImpl implements DeviceitemService { - - @Override - public Map queryAll(Map whereJson, Pageable page) { - WQLObject wo = WQLObject.getWQLObject("pdm_bi_deviceitem"); - final String search = MapUtil.getStr(whereJson, "search"); - String where = ""; - if (!StrUtil.isEmpty(search)) { - where = " AND (item_code like '%" + search + "%' OR item_name like '%" + search + "%' ) "; - } - ResultBean rb = wo.pagequery(WqlUtil.getHttpContext(page), "1 = 1" + where, "order_seq"); - final JSONObject json = rb.pageResult(); - final JSONArray array = json.getJSONArray("content"); - for (int i = 0; i < array.size(); i++) { - final JSONObject jsonObject = array.getJSONObject(i); - jsonObject.put("is_show","1"); - } - return json; - } - - @Override - public List queryAll(Map whereJson) { - WQLObject wo = WQLObject.getWQLObject("pdm_bi_deviceitem"); - JSONArray arr = wo.query().getResultJSONArray(0); - if (ObjectUtil.isNotEmpty(arr)) return arr.toJavaList(DeviceitemDto.class); - return null; - } - - @Override - public DeviceitemDto findById(Long item_id) { - WQLObject wo = WQLObject.getWQLObject("pdm_bi_deviceitem"); - JSONObject json = wo.query("item_id = '" + item_id + "'").uniqueResult(0); - if (ObjectUtil.isNotEmpty(json)) { - return json.toJavaObject(DeviceitemDto.class); - } - return null; - } - - @Override - public DeviceitemDto findByCode(String code) { - WQLObject wo = WQLObject.getWQLObject("pdm_bi_deviceitem"); - JSONObject json = wo.query("item_code ='" + code + "'").uniqueResult(0); - if (ObjectUtil.isNotEmpty(json)) { - return json.toJavaObject(DeviceitemDto.class); - } - return null; - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void create(DeviceitemDto dto) { - //编码唯一性校验 - String item_code = dto.getItem_code(); - DeviceitemDto byCode = this.findByCode(item_code); - if (ObjectUtil.isNotEmpty(byCode)) throw new BadRequestException("编码已存在!"); - dto.setItem_id(IdUtil.getSnowflake(1, 1).nextId()); - WQLObject wo = WQLObject.getWQLObject("pdm_bi_deviceitem"); - JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto)); - wo.insert(json); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void update(DeviceitemDto dto) { - DeviceitemDto entity = this.findById(dto.getItem_id()); - if (entity == null) throw new BadRequestException("被删除或无权限，操作失败!"); - - //编码唯一性校验 - WQLObject wo = WQLObject.getWQLObject("PDM_BI_DeviceItem"); - String where = "item_code = '" + dto.getItem_code() + "' and item_id != '" + dto.getItem_id()+"'"; - - JSONObject jsonObject = wo.query(where).uniqueResult(0); - if (ObjectUtil.isNotEmpty(jsonObject)) { - throw new BadRequestException("编码已存在!"); - } - JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto)); - wo.update(json); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void deleteAll(Long[] ids) { - WQLObject wo = WQLObject.getWQLObject("pdm_bi_deviceitem"); - for (Long item_id : ids) { - wo.delete("item_id = '" + item_id + "'"); - } - } - -} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/ProcessrouteServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/ProcessrouteServiceImpl.java deleted file mode 100644 index 5757a2205..000000000 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/ProcessrouteServiceImpl.java +++ /dev/null @@ -1,250 +0,0 @@ - -package org.nl.wms.pdm.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.common.utils.SecurityUtils; -import org.nl.system.service.user.dto.CurrentUser; - -import org.nl.wms.pdm.service.ProcessrouteService; -import org.nl.wms.pdm.service.dto.ProcessrouteDto; -import org.nl.modules.wql.WQL; -import org.nl.modules.wql.core.bean.WQLObject; -import org.nl.modules.wql.util.WqlUtil; -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; - -/** - * @author Zz - * @description 服务实现 - * @date 2022-03-21 - **/ -@Service -@RequiredArgsConstructor -@Slf4j -public class ProcessrouteServiceImpl implements ProcessrouteService { - - @Override - public Map queryAll(Map whereJson, Pageable page) { - String processroute_code = MapUtil.getStr(whereJson, "processroute_code"); - HashMap map = new HashMap<>(); - - map.put("flag", "1"); - map.put("processroute_status", MapUtil.getStr(whereJson, "processroute_status")); - if (StrUtil.isNotEmpty(processroute_code)) map.put("processroute_code", "%" + processroute_code + "%"); - - JSONObject json = WQL.getWO("QP_BI_PROCESSROUTE01").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "update_time desc"); - return json; - } - - @Override - public List queryAll(Map whereJson) { - WQLObject wo = WQLObject.getWQLObject("pdm_bi_processroute"); - JSONArray arr = wo.query().getResultJSONArray(0); - List list = arr.toJavaList(ProcessrouteDto.class); - return list; - } - - @Override - public ProcessrouteDto findById(String processroute_id) { - WQLObject wo = WQLObject.getWQLObject("pdm_bi_processroute"); - JSONObject json = wo.query("processroute_id = '" + processroute_id + "'").uniqueResult(0); - final ProcessrouteDto obj = json.toJavaObject(ProcessrouteDto.class); - return obj; - } - - @Override - public ProcessrouteDto findByCode(String code) { - WQLObject wo = WQLObject.getWQLObject("pdm_bi_processroute"); - JSONObject json = wo.query("code ='" + code + "'").uniqueResult(0); - final ProcessrouteDto obj = json.toJavaObject(ProcessrouteDto.class); - return obj; - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void create(JSONObject json) { - String currentUserId = SecurityUtils.getCurrentUserId(); - String nickName = SecurityUtils.getCurrentNickName(); - String now = DateUtil.now(); - Long deptId = SecurityUtils.getDeptId(); - - WQLObject mstTab = WQLObject.getWQLObject("pdm_bi_processroute"); // 工艺路线主表 - WQLObject dtlTab = WQLObject.getWQLObject("PDM_BI_ProcessRouteDtl"); // 工艺路线明细表 - WQLObject workTab = WQLObject.getWQLObject("pdm_bi_workprocedure"); // 工序表 - JSONArray jsonDataArr = json.getJSONArray("tableData"); - - // 插入主表 - JSONObject jsonMst = new JSONObject(); - jsonMst.put("processroute_id", IdUtil.getSnowflake(1, 1).nextId()); - jsonMst.put("processroute_code", json.getString("processroute_code")); - jsonMst.put("processroute_name", json.getString("processroute_name")); - jsonMst.put("processroute_status", "10"); - jsonMst.put("detail_count", jsonDataArr.size()); - jsonMst.put("remark", json.getString("remark")); - jsonMst.put("create_id", currentUserId); - jsonMst.put("create_name", nickName); - jsonMst.put("create_time", now); - jsonMst.put("sysdeptid", deptId); - jsonMst.put("syscompanyid", deptId); - mstTab.insert(jsonMst); - // 插入明细表 - for (int i = 0; i < jsonDataArr.size(); i++) { - JSONObject jsonObject = jsonDataArr.getJSONObject(i); - JSONObject jsonWork = workTab.query("workprocedure_id = '" + jsonObject.getString("workprocedure_id") + "'").uniqueResult(0); - - JSONObject jsonDtl = new JSONObject(); - jsonDtl.put("processroutedtl_id", IdUtil.getSnowflake(1, 1).nextId()); - jsonDtl.put("processroute_id", jsonMst.get("processroute_id")); - jsonDtl.put("workprocedure_no", i+1); - jsonDtl.put("workprocedure_id", jsonWork.get("workprocedure_id")); - jsonDtl.put("workprocedure_code", jsonWork.getString("workprocedure_code")); - jsonDtl.put("workprocedure_name", jsonWork.getString("workprocedure_name")); - jsonDtl.put("process_explain", jsonObject.getString("process_explain")); - jsonDtl.put("is_check", jsonObject.getString("is_check")); - dtlTab.insert(jsonDtl); - } - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void update(JSONObject whereJson) { - String processroute_id = MapUtil.getStr(whereJson, "processroute_id"); - ProcessrouteDto entity = this.findById(processroute_id); - if (entity == null) throw new BadRequestException("被删除或无权限，操作失败!"); - - - WQLObject mstTab = WQLObject.getWQLObject("pdm_bi_processroute"); // 工艺路线主表 - WQLObject dtlTab = WQLObject.getWQLObject("PDM_BI_ProcessRouteDtl"); // 工艺路线明细表 - WQLObject workTab = WQLObject.getWQLObject("pdm_bi_workprocedure"); // 工序表 - - JSONArray dataArr = whereJson.getJSONArray("tableData"); - // 更新主表 - JSONObject jsonMst = mstTab.query("processroute_id= '" + processroute_id + "'").uniqueResult(0); - jsonMst.put("processroute_code", whereJson.getString("processroute_code")); - jsonMst.put("processroute_name", whereJson.getString("processroute_name")); - jsonMst.put("remark", whereJson.getString("remark")); - jsonMst.put("update_optid", SecurityUtils.getCurrentUserId()); - jsonMst.put("update_optname", SecurityUtils.getCurrentNickName()); - jsonMst.put("update_time", DateUtil.now()); - jsonMst.put("detail_count", dataArr.size()); - mstTab.update(jsonMst); - // 更新明细表 - JSONArray dtlArr = dtlTab.query("processroute_id = '" + processroute_id + "'").getResultJSONArray(0); - if (ObjectUtil.isNotEmpty(dtlArr)) dtlTab.delete("processroute_id = '" + processroute_id + "'"); - for (int i = 0; i < dataArr.size(); i++) { - JSONObject jsonObject = dataArr.getJSONObject(i); - JSONObject jsonWork = workTab.query("workprocedure_id = '" + jsonObject.getString("workprocedure_id") + "'").uniqueResult(0); - - JSONObject jsonDtl = new JSONObject(); - jsonDtl.put("processroutedtl_id", IdUtil.getSnowflake(1, 1).nextId()); - jsonDtl.put("processroute_id", jsonMst.get("processroute_id")); - jsonDtl.put("workprocedure_no", i+1); - jsonDtl.put("workprocedure_id", jsonObject.get("workprocedure_id")); - jsonDtl.put("workprocedure_code", jsonWork.getString("workprocedure_code")); - jsonDtl.put("workprocedure_name", jsonWork.getString("workprocedure_name")); - jsonDtl.put("process_explain", jsonObject.getString("process_explain")); - jsonDtl.put("is_check", jsonObject.getString("is_check")); - dtlTab.insert(jsonDtl); - } - - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void deleteAll(Long[] ids) { - String currentUserId = SecurityUtils.getCurrentUserId(); - String nickName = SecurityUtils.getCurrentNickName(); - String now = DateUtil.now(); - - WQLObject wo = WQLObject.getWQLObject("pdm_bi_processroute"); - for (Long processroute_id : ids) { - JSONObject param = new JSONObject(); - param.put("processroute_id", String.valueOf(processroute_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 JSONArray getWorkList() { - JSONArray resultJSONArray = WQL.getWO("QP_BI_PROCESSROUTE01").addParam("flag", "2").process().getResultJSONArray(0); - return resultJSONArray; - } - - @Override - @Transactional(rollbackFor = Exception.class) - public JSONArray getDtl(Map map) { - String processroute_id = MapUtil.getStr(map, "processroute_id"); - WQLObject dtlTab = WQLObject.getWQLObject("PDM_BI_ProcessRouteDtl"); - - JSONArray dtlArr = dtlTab.query("processroute_id ='" + processroute_id + "' order by workprocedure_no ASC").getResultJSONArray(0); - return dtlArr; - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void submit(JSONObject whereJson) { - JSONArray dataArr = whereJson.getJSONArray("data"); - - WQLObject mstTab = WQLObject.getWQLObject("pdm_bi_processroute"); // 工艺路线主表 - - for (int i = 0; i < dataArr.size(); i++) { - JSONObject json = dataArr.getJSONObject(i); - JSONObject jsonMst = mstTab.query("processroute_id ='" + json.getString("processroute_id") + "' and is_delete = '0'").uniqueResult(0); - if (!StrUtil.equals(jsonMst.getString("processroute_status"), "10")) { - throw new BadRequestException("只能对生成状态的提交"); - } - jsonMst.put("processroute_status", "20"); - jsonMst.put("update_optid", SecurityUtils.getCurrentUserId()); - jsonMst.put("update_optname", SecurityUtils.getCurrentNickName()); - jsonMst.put("update_time", DateUtil.now()); - jsonMst.put("audit_optid", SecurityUtils.getCurrentUserId()); - jsonMst.put("audit_optname", SecurityUtils.getCurrentNickName()); - jsonMst.put("audit_time", DateUtil.now()); - mstTab.update(jsonMst); - } - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void CancelSubmit(JSONObject whereJson) { - JSONArray dataArr = whereJson.getJSONArray("data"); - - WQLObject mstTab = WQLObject.getWQLObject("pdm_bi_processroute"); // 工艺路线主表 - - for (int i = 0; i < dataArr.size(); i++) { - JSONObject json = dataArr.getJSONObject(i); - JSONObject jsonMst = mstTab.query("processroute_id ='" + json.getString("processroute_id") + "' and is_delete = '0'").uniqueResult(0); - if (!StrUtil.equals(jsonMst.getString("processroute_status"), "20")) { - throw new BadRequestException("只能对提交状态的取消提交"); - } - jsonMst.put("processroute_status", "10"); - jsonMst.put("update_optid", SecurityUtils.getCurrentUserId()); - jsonMst.put("update_optname", SecurityUtils.getCurrentNickName()); - jsonMst.put("update_time", DateUtil.now()); - jsonMst.put("audit_optid", ""); - jsonMst.put("audit_optname", ""); - jsonMst.put("audit_time", ""); - mstTab.update(jsonMst); - } - } -} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/RawfoilworkorderServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/RawfoilworkorderServiceImpl.java index 90300daf5..2adf3ac17 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/RawfoilworkorderServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/RawfoilworkorderServiceImpl.java @@ -7,6 +7,8 @@ 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.basedata.st.service.impl.UserAreaServiceImpl; +import org.nl.wms.basedata.st.service.impl.UserStorServiceImpl; import org.nl.wms.pdm.service.RawfoilworkorderService; import org.nl.wms.pdm.service.dto.RawfoilworkorderDto; import org.springframework.stereotype.Service; @@ -47,6 +49,10 @@ public class RawfoilworkorderServiceImpl implements RawfoilworkorderService { String begin_time = MapUtil.getStr(whereJson, "begin_time"); String end_time = MapUtil.getStr(whereJson, "end_time"); + //获取人员对应的区域 + UserAreaServiceImpl userAreaService = new UserAreaServiceImpl(); + String in_area_id = userAreaService.getInArea(); + JSONObject map = new JSONObject(); map.put("flag", "1"); if (ObjectUtil.isNotEmpty(resource_name)) map.put("resource_name","%"+resource_name+"%"); @@ -55,6 +61,7 @@ public class RawfoilworkorderServiceImpl implements RawfoilworkorderService { map.put("end_time",end_time); map.put("product_area",product_area); map.put("status",status); + if (ObjectUtil.isNotEmpty(in_area_id)) map.put("in_area_id", in_area_id); JSONObject json = WQL.getWO("PDM_BI_RAWFOILWORKORDER_01").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "der.container_name"); return json; diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/SlittingproductionplanServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/SlittingproductionplanServiceImpl.java index 92b12f8a0..8f55b2433 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/SlittingproductionplanServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/SlittingproductionplanServiceImpl.java @@ -8,6 +8,7 @@ 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.basedata.st.service.impl.UserAreaServiceImpl; import org.nl.wms.ext.mes.service.LmsToMesService; import org.nl.wms.pdm.service.SlittingproductionplanService; import org.nl.wms.pdm.service.dto.SlittingproductionplanDto; @@ -59,6 +60,10 @@ public class SlittingproductionplanServiceImpl implements Slittingproductionplan String begin_time = MapUtil.getStr(whereJson, "begin_time"); String end_time = MapUtil.getStr(whereJson, "end_time"); + //获取人员对应的区域 + UserAreaServiceImpl userAreaService = new UserAreaServiceImpl(); + String in_area_id = userAreaService.getInArea(); + JSONObject map = new JSONObject(); map.put("flag", "1"); map.put("order_type", order_type); @@ -74,6 +79,7 @@ public class SlittingproductionplanServiceImpl implements Slittingproductionplan 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+"%"); if (ObjectUtil.isNotEmpty(qzzno)) map.put("qzzno","%"+qzzno+"%"); + if (ObjectUtil.isNotEmpty(in_area_id)) map.put("in_area_id", in_area_id); JSONObject json = WQL.getWO("PDM_BI_SLIDTTINGPLAN_01").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "LEFT(plan.start_time,10) DESC, container_name desc, split_group"); return json; diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/WorkProcedureServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/WorkProcedureServiceImpl.java deleted file mode 100644 index ad3350900..000000000 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/WorkProcedureServiceImpl.java +++ /dev/null @@ -1,155 +0,0 @@ - -package org.nl.wms.pdm.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.JSON; -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.common.utils.SecurityUtils; -import org.nl.wms.pdm.service.WorkProcedureService; -import org.nl.wms.pdm.service.dto.WorkProcedureDto; -import org.nl.modules.wql.core.bean.ResultBean; -import org.nl.modules.wql.core.bean.WQLObject; -import org.nl.modules.wql.util.WqlUtil; -import org.springframework.data.domain.Pageable; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.List; -import java.util.Map; - -/** - * @author ldjun - * @description 服务实现 - * @date 2021-12-19 - **/ -@Service -@RequiredArgsConstructor -@Slf4j -public class WorkProcedureServiceImpl implements WorkProcedureService { - - @Override - public Map queryAll(Map whereJson, Pageable page) { - String where = ""; - WQLObject wo = WQLObject.getWQLObject("PDM_BI_WorkProcedure"); - String search = (String) whereJson.get("search"); - if (!StrUtil.isEmpty(search)) { - where = " AND (workprocedure_code like '%" + search + "%' OR workprocedure_name like '%" + search + "%' ) "; - } - ResultBean rb = wo.pagequery(WqlUtil.getHttpContext(page), "is_delete= '0' " + where, "update_time desc"); - final JSONObject json = rb.pageResult(); - return json; - } - - @Override - public List queryAll(Map whereJson) { - WQLObject wo = WQLObject.getWQLObject("pdm_bi_workProcedure"); - JSONArray arr = wo.query().getResultJSONArray(0); - List list = arr.toJavaList(WorkProcedureDto.class); - return list; - } - - @Override - public WorkProcedureDto findById(Long workProcedure_id) { - WQLObject wo = WQLObject.getWQLObject("pdm_bi_workProcedure"); - JSONObject json = wo.query("workProcedure_id =" + workProcedure_id + "").uniqueResult(0); - if (ObjectUtil.isEmpty(json)) return null; - final WorkProcedureDto obj = json.toJavaObject(WorkProcedureDto.class); - return obj; - } - - @Override - public WorkProcedureDto findByCode(String code) { - WQLObject wo = WQLObject.getWQLObject("pdm_bi_workProcedure"); - JSONObject json = wo.query("workprocedure_code ='" + code + "'").uniqueResult(0); - if (ObjectUtil.isEmpty(json)) return null; - final WorkProcedureDto obj = json.toJavaObject(WorkProcedureDto.class); - return obj; - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void create(WorkProcedureDto dto) { - //判断编码是否存在 - String workprocedure_code = dto.getWorkprocedure_code(); - WorkProcedureDto byCode = this.findByCode(workprocedure_code); - if (ObjectUtil.isNotEmpty(byCode)) throw new BadRequestException("编码已存在!"); - - String currentUserId = SecurityUtils.getCurrentUserId(); - String nickName = SecurityUtils.getCurrentNickName(); - String now = DateUtil.now(); - Long deptId = SecurityUtils.getDeptId(); - - dto.setWorkprocedure_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.setSyscompanyid(deptId); - dto.setSysdeptid(deptId); - - WQLObject wo = WQLObject.getWQLObject("pdm_bi_workProcedure"); - JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto)); - wo.insert(json); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void update(WorkProcedureDto dto) { - WorkProcedureDto entity = this.findById(dto.getWorkprocedure_id()); - if (entity == null) throw new BadRequestException("被删除或无权限，操作失败!"); - - String workprocedure_code = entity.getWorkprocedure_code(); - WorkProcedureDto byCode = this.findByCode(workprocedure_code); - if (ObjectUtil.isNotEmpty(byCode) && !dto.getWorkprocedure_id().equals(byCode.getWorkprocedure_id())) - throw new BadRequestException("存在相同的编码!"); - - String 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_workProcedure"); - JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto)); - wo.update(json); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void deleteAll(Long[] ids) { - String currentUserId = SecurityUtils.getCurrentUserId(); - String nickName = SecurityUtils.getCurrentNickName(); - String now = DateUtil.now(); - - WQLObject wo = WQLObject.getWQLObject("pdm_bi_workProcedure"); - for (Long workProcedure_id : ids) { - JSONObject param = new JSONObject(); - param.put("workprocedure_id", String.valueOf(workProcedure_id)); - param.put("is_delete", "1"); - param.put("update_optid", currentUserId); - param.put("update_optname", nickName); - param.put("update_time", now); - wo.delete(param); - } - } - - @Override - public JSONArray downSelect() { - //工序表【PDM_BI_WorkProcedure】 - WQLObject workProcedureTab = WQLObject.getWQLObject("PDM_BI_WorkProcedure"); - JSONArray resultJSONArray = workProcedureTab.query("is_delete = '0' and is_used ='1'", "workprocedure_code").getResultJSONArray(0); - return resultJSONArray; - } -} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/PDM_BI_RAWFOILWORKORDER_01.wql b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/PDM_BI_RAWFOILWORKORDER_01.wql index b2c521c55..f68024055 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/PDM_BI_RAWFOILWORKORDER_01.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/PDM_BI_RAWFOILWORKORDER_01.wql @@ -20,6 +20,7 @@ 输入.end_time TYPEAS s_string 输入.status TYPEAS s_string 输入.product_area TYPEAS s_string + 输入.in_area_id TYPEAS f_string [临时表] @@ -54,6 +55,7 @@ LEFT JOIN ST_IVT_SbPointIvt ivt ON ivt.ext_code = der.resource_name WHERE der.is_delete = '0' + AND der.product_area in 输入.in_area_id OPTION 输入.resource_name <> "" der.resource_name like 输入.resource_name diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/PDM_BI_SLIDTTINGPLAN_01.wql b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/PDM_BI_SLIDTTINGPLAN_01.wql index ca1f0e376..b93eb2bbe 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/PDM_BI_SLIDTTINGPLAN_01.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/PDM_BI_SLIDTTINGPLAN_01.wql @@ -27,6 +27,7 @@ 输入.is_child_tz_ok TYPEAS s_string 输入.is_parent_ok TYPEAS s_string 输入.is_call TYPEAS s_string + 输入.in_area_id TYPEAS f_string [临时表] @@ -62,6 +63,7 @@ LEFT JOIN ST_IVT_CutPointIvt ivt ON ivt.ext_code = plan.resource_name WHERE plan.is_delete = '0' + AND ivt.product_area in 输入.in_area_id OPTION 输入.order_type <> "" plan.order_type = 输入.order_type diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/QP_BI_PROCESSROUTE01.wql b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/QP_BI_PROCESSROUTE01.wql deleted file mode 100644 index 4f28a9533..000000000 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/QP_BI_PROCESSROUTE01.wql +++ /dev/null @@ -1,82 +0,0 @@ -[交易说明] - 交易名： 工艺路线分页查询 - 所属模块： - 功能简述： - 版权所有： - 表引用： - 版本经历： - -[数据库] - --指定数据库，为空采用默认值，默认为db.properties中列出的第一个库 - -[IO定义] - ################################################# - ## 表字段对应输入参数 - ################################################# - 输入.flag TYPEAS s_string - 输入.processroute_status TYPEAS s_string - 输入.processroute_code TYPEAS s_string - - -[临时表] - --这边列出来的临时表就会在运行期动态创建 - -[临时变量] - --所有中间过程变量均可在此处定义 - -[业务过程] - - ########################################## - # 1、输入输出检查 # - ########################################## - - - ########################################## - # 2、主过程前处理 # - ########################################## - - - ########################################## - # 3、业务主过程 # - ########################################## - - IF 输入.flag = "1" - PAGEQUERY - SELECT - * - FROM - PDM_BI_ProcessRoute - WHERE - is_delete = '0' - - OPTION 输入.processroute_code <> "" - (processroute_code like 输入.processroute_code or - processroute_name like 输入.processroute_code) - ENDOPTION - - OPTION 输入.processroute_status <> "" - processroute_status = 输入.processroute_status - ENDOPTION - - ENDSELECT - ENDPAGEQUERY - ENDIF - - IF 输入.flag = "2" - QUERY - SELECT - workprocedure_id AS value, - workprocedure_name AS label, - workprocedure_code AS code - FROM - PDM_BI_WorkProcedure - WHERE - is_delete = '0' - AND is_used = '1' - - ENDSELECT - ENDQUERY - ENDIF - - - diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/ST_IVT_COOLPOINTIVT.wql b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/ST_IVT_COOLPOINTIVT.wql index 506129888..053af445a 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/ST_IVT_COOLPOINTIVT.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/ST_IVT_COOLPOINTIVT.wql @@ -18,17 +18,18 @@ 输入.container_name TYPEAS s_string 输入.full_point_status TYPEAS s_string 输入.empty_point_status TYPEAS s_string - 输入.cool_ivt_status TYPEAS s_string + 输入.cool_ivt_status TYPEAS s_string 输入.product_area TYPEAS s_string - 输入.is_used TYPEAS s_string + 输入.is_used TYPEAS s_string 输入.begin_time TYPEAS s_string 输入.end_time TYPEAS s_string 输入.start_point_code TYPEAS s_string - 输入.end_point_code TYPEAS s_string - 输入.pcsn TYPEAS s_string - 输入.vehicle_code TYPEAS s_string + 输入.end_point_code TYPEAS s_string + 输入.pcsn TYPEAS s_string + 输入.vehicle_code TYPEAS s_string 输入.bill_status TYPEAS s_string - 输入.point_location TYPEAS s_string + 输入.point_location TYPEAS s_string + 输入.in_area_id TYPEAS f_string [临时表] @@ -59,7 +60,7 @@ FROM st_ivt_coolpointivt cool WHERE - 1=1 + cool.product_area in 输入.in_area_id OPTION 输入.point_code <> "" point_code LIKE 输入.point_code ENDOPTION diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/ST_IVT_CUTPOINTIVT.wql b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/ST_IVT_CUTPOINTIVT.wql index ba5bd5aa3..4648cad7d 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/ST_IVT_CUTPOINTIVT.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/ST_IVT_CUTPOINTIVT.wql @@ -18,7 +18,8 @@ 输入.full_point_status TYPEAS s_string 输入.empty_point_status TYPEAS s_string 输入.product_area TYPEAS s_string - 输入.is_used TYPEAS s_string + 输入.is_used TYPEAS s_string + 输入.in_area_id TYPEAS f_string [临时表] @@ -49,7 +50,7 @@ FROM st_ivt_cutpointivt cut WHERE - 1=1 + cut.product_area in 输入.in_area_id OPTION 输入.point_code <> "" point_code LIKE 输入.point_code ENDOPTION diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/ST_IVT_DELIVERYPOINTIVT.wql b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/ST_IVT_DELIVERYPOINTIVT.wql index 727f0056e..4c66ffcdf 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/ST_IVT_DELIVERYPOINTIVT.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/ST_IVT_DELIVERYPOINTIVT.wql @@ -17,7 +17,8 @@ 输入.point_code TYPEAS s_string 输入.point_status TYPEAS s_string 输入.product_area TYPEAS s_string - 输入.is_used TYPEAS s_string + 输入.is_used TYPEAS s_string + 输入.in_area_id TYPEAS f_string [临时表] @@ -48,7 +49,7 @@ FROM st_ivt_deliverypointivt deliver WHERE - 1=1 + deliver.product_area in 输入.in_area_id OPTION 输入.point_code <> "" point_code LIKE 输入.point_code ENDOPTION diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/ST_IVT_HOTPOINTIVT.wql b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/ST_IVT_HOTPOINTIVT.wql index d53bf8464..018e1f4d9 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/ST_IVT_HOTPOINTIVT.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/ST_IVT_HOTPOINTIVT.wql @@ -27,6 +27,7 @@ 输入.start_point_code TYPEAS s_string 输入.next_point_code TYPEAS s_string 输入.point_location TYPEAS s_string + 输入.in_area_id TYPEAS f_string [临时表] @@ -57,7 +58,7 @@ FROM st_ivt_hotpointivt hot WHERE - 1=1 + hot.product_area in 输入.in_area_id OPTION 输入.point_location <> "" point_location = 输入.point_location ENDOPTION diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/ST_IVT_SBPOINTIVT.wql b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/ST_IVT_SBPOINTIVT.wql index a76dc5cc1..039e454b8 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/ST_IVT_SBPOINTIVT.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/ST_IVT_SBPOINTIVT.wql @@ -16,7 +16,8 @@ 输入.flag TYPEAS s_string 输入.point_code TYPEAS s_string 输入.product_area TYPEAS s_string - 输入.is_used TYPEAS s_string + 输入.is_used TYPEAS s_string + 输入.in_area_id TYPEAS f_string [临时表] @@ -47,7 +48,7 @@ FROM st_ivt_sbpointivt sb WHERE - 1=1 + sb.product_area in 输入.in_area_id OPTION 输入.point_code <> "" point_code LIKE 输入.point_code ENDOPTION 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 94fd2a07c..7fbdc0041 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/sch/manage/AutoCreateTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AutoCreateTask.java deleted file mode 100644 index 9c6569814..000000000 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AutoCreateTask.java +++ /dev/null @@ -1,120 +0,0 @@ -package org.nl.wms.sch.manage; - -import cn.hutool.core.date.DateUtil; -import cn.hutool.core.util.ObjectUtil; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; -import lombok.SneakyThrows; -import lombok.extern.slf4j.Slf4j; -import org.nl.modules.wql.core.bean.WQLObject; -import org.nl.wms.sch.AcsTaskDto; -import org.nl.wms.sch.AcsUtil; -import org.reflections.Reflections; -import org.springframework.stereotype.Component; - -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; -import java.util.ArrayList; -import java.util.List; -import java.util.Set; - -@Slf4j -@Component -public class AutoCreateTask { - // 下发acs的任务集合 - private List taskList = null; - private Set> subTypes = null; - - WQLObject taskTab = null; - - @SneakyThrows - public void run() { - if (ObjectUtil.isNull(subTypes) || subTypes.isEmpty()) { - Reflections reflections = new Reflections("org.nl.wms.sch.tasks"); - subTypes = reflections.getSubTypesOf(AbstractAcsTask.class); - } - if (ObjectUtil.isNull(taskTab)) taskTab = WQLObject.getWQLObject("sch_base_task"); - taskList = new ArrayList<>(); - - this.doExecute(); - } - - - private void doExecute() { - subTypes.forEach(clz -> { - // 调用AbstractAcsTask类的每个子类的schedule()方法 - try { - Object obj = clz.newInstance(); - //Method m = obj.getClass().getDeclaredMethod("schedule"); - Method m = obj.getClass().getMethod("schedule"); - List tasks = (List) m.invoke(obj); - if (ObjectUtil.isNotEmpty(tasks)) { - taskList.addAll(tasks); - } - } catch (InvocationTargetException e) { - e.printStackTrace(); - log.error("定时器执行失败:{}", e.getTargetException().getMessage()); - } catch (Exception e) { - e.printStackTrace(); - log.error("定时器执行失败:{}", e.getMessage()); - } - - }); - if (ObjectUtil.isEmpty(taskList)) { - return; - } - - JSONArray arr = new JSONArray(); - taskList.forEach(item -> { - JSONObject param = JSONObject.parseObject(JSON.toJSONString(item)); - arr.add(param); - }); - String api = "api/wms/task"; - - log.info("下发acs任务的参数为:{}", arr.toString()); - JSONObject result = AcsUtil.notifyAcs(api, arr); - log.info("下发acs任务的返回结果为:{}", result.toString()); - - - String status = result.getString("status"); - String message = result.getString("message"); - //发送失败的任务JSON集合:task_id,message - JSONArray errArr = result.getJSONArray("errArr"); - - //任务下发以后，更新任务状态 - //成功 - if ("200".equals(status)) { - taskList.forEach(item -> { - JSONObject taskObj = new JSONObject(); - taskObj.put("task_id", item.getExt_task_id()); - taskObj.put("task_status", TaskStatusEnum.ISSUE.getCode()); - taskObj.put("remark", "下发成功"); - taskObj.put("update_time", DateUtil.now()); - taskTab.update(taskObj); - }); - } else {//下发失败 - taskList.forEach(item -> { - JSONObject taskObj = new JSONObject(); - taskObj.put("task_id", item.getExt_task_id()); - taskObj.put("task_status", TaskStatusEnum.ISSUE.getCode()); - taskObj.put("remark", "下发失败:" + message); - taskObj.put("update_time", DateUtil.now()); - taskTab.update(taskObj); - }); - } - //处理下发错误的任务 - if (ObjectUtil.isNotEmpty(errArr)) { - //处理下发失败的任务 - for (int i = 0; i < errArr.size(); i++) { - JSONObject taskObj = errArr.getJSONObject(i); - taskObj.put("remark", "下发失败:"+taskObj.getString("message")); - taskObj.put("update_time", DateUtil.now()); - taskTab.update(taskObj); - } - } - - } - - -} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/InCoolIvtTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/InCoolIvtTask.java index 00b570a44..49b135942 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/InCoolIvtTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/InCoolIvtTask.java @@ -85,7 +85,7 @@ public class InCoolIvtTask extends AbstractAcsTask { if (StrUtil.equals(status, "0")) { // 取消删除任务 - taskTab.delete("task_id = '" + task_id + "'");// 更新删除字段 + //taskTab.delete("task_id = '" + task_id + "'");// 更新删除字段 jsonTask.put("is_delete", "1"); jsonTask.put("update_time", DateUtil.now()); taskTab.update(jsonTask); @@ -152,8 +152,11 @@ public class InCoolIvtTask extends AbstractAcsTask { //判断该接口是否需要回传 JSONObject back_jo = WQLObject.getWQLObject("MD_PB_InterfaceBack").query("interface_name = 'momRollSemiFGInboundComplete'").uniqueResult(0); - if (ObjectUtil.isNotEmpty(back_jo) && back_jo.getString("is_back").equals("1")) { - new LmsToMesServiceImpl().momRollSemiFGInboundComplete(param); + if (ObjectUtil.isNotEmpty(back_jo) && "1".equals(back_jo.getString("is_back"))) { + String product_area = back_jo.getString("product_area"); + if (StrUtil.isNotEmpty(product_area) && product_area.contains(jsonTask.getString("product_area"))){ + new LmsToMesServiceImpl().momRollSemiFGInboundComplete(param); + } } //将该母卷的入冷却标识改为0 diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/InHotTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/InHotTask.java index 40859e1fd..432959296 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/InHotTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/InHotTask.java @@ -188,18 +188,10 @@ public class InHotTask extends AbstractAcsTask { log.info("入烘箱wql执行update语句！"); hotIvtTab.update(jsonHotIvt); - JSONObject update_ivt = hotIvtTab.query("point_code = '" + jsonTask.getString("point_code1") + "'").uniqueResult(0); - log.info("更新完后烘箱库存为：-----------------" + update_ivt.toString()); log.info("入烘箱mybatis执行update语句！"); HotMapper hotMapper = SpringContextHolder.getBean(HotMapper.class); hotMapper.updateHotByObject(jsonHotIvt); - JSONObject update_ivt2 = hotIvtTab.query("point_code = '" + jsonTask.getString("point_code3") + "'").uniqueResult(0); - log.info("更新完后烘箱库存为：-----------------" + update_ivt2.toString()); - - if (!update_ivt2.getString("container_name").equals(update_ivt.getString("container_name"))){ - log.info("入烘箱WQL更新不成功！"); - } hot_point_code = jsonHotIvt.getString("ext_code"); } @@ -218,8 +210,11 @@ public class InHotTask extends AbstractAcsTask { //判断该接口是否需要回传 JSONObject back_jo = WQLObject.getWQLObject("MD_PB_InterfaceBack").query("interface_name = 'momRollBakeInBound'").uniqueResult(0); - if (ObjectUtil.isNotEmpty(back_jo) && back_jo.getString("is_back").equals("1")) { - new LmsToMesServiceImpl().momRollBakeInBound(param); + if (ObjectUtil.isNotEmpty(back_jo) && "1".equals(back_jo.getString("is_back"))) { + String product_area = back_jo.getString("product_area"); + if (StrUtil.isNotEmpty(product_area) && product_area.contains(jsonTask.getString("product_area"))){ + new LmsToMesServiceImpl().momRollBakeInBound(param); + } } //将该母卷的入烘箱标识改为0 diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/OutHotTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/OutHotTask.java index 1a600ad49..4e10ae2f5 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/OutHotTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/OutHotTask.java @@ -155,8 +155,11 @@ public class OutHotTask extends AbstractAcsTask { //判断该接口是否需要回传 JSONObject back_jo = WQLObject.getWQLObject("MD_PB_InterfaceBack").query("interface_name = 'momRollBakeOutBound'").uniqueResult(0); - if (ObjectUtil.isNotEmpty(back_jo) && back_jo.getString("is_back").equals("1")){ - new LmsToMesServiceImpl().momRollBakeOutBound(param); + if (ObjectUtil.isNotEmpty(back_jo) && "1".equals(back_jo.getString("is_back"))){ + String product_area = back_jo.getString("product_area"); + if (StrUtil.isNotEmpty(product_area) && product_area.contains(jsonTask.getString("product_area"))){ + new LmsToMesServiceImpl().momRollBakeOutBound(param); + } } } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/rest/InStorController.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/rest/InStorController.java deleted file mode 100644 index 28fcf0a2d..000000000 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/rest/InStorController.java +++ /dev/null @@ -1,77 +0,0 @@ - -package org.nl.wms.st.inbill.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.RegionioInService; -import org.nl.wms.st.inbill.service.dto.RegionioDto; -import org.springframework.data.domain.Pageable; -import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - -import java.util.Map; - -/** - * @author Liuxy - * @date 2022-08-11 - **/ -@RestController -@RequiredArgsConstructor -@Api(tags = "区域入库管理") -@RequestMapping("/api/regionioIn") -@Slf4j -public class InStorController { - - private final RegionioInService rgionioInService; - - @GetMapping - @Log("查询区域入库") - @ApiOperation("查询区域入库") - //@PreAuthorize("@el.check('regionio:list')") - public ResponseEntity query(@RequestParam Map whereJson, Pageable page) { - return new ResponseEntity<>(rgionioInService.queryAll(whereJson, page), HttpStatus.OK); - } - - @PostMapping - @Log("新增区域入库") - @ApiOperation("新增区域入库") - //@PreAuthorize("@el.check('regionio:add')") - public ResponseEntity create(@Validated @RequestBody RegionioDto dto) { - rgionioInService.create(dto); - return new ResponseEntity<>(HttpStatus.CREATED); - } - - @PutMapping - @Log("修改区域入库") - @ApiOperation("修改区域入库") - //@PreAuthorize("@el.check('regionio:edit')") - public ResponseEntity update(@Validated @RequestBody RegionioDto dto) { - rgionioInService.update(dto); - return new ResponseEntity<>(HttpStatus.NO_CONTENT); - } - - @Log("删除区域入库") - @ApiOperation("删除区域入库") - //@PreAuthorize("@el.check('regionio:del')") - @DeleteMapping - public ResponseEntity delete(@RequestBody Long[] ids) { - rgionioInService.deleteAll(ids); - return new ResponseEntity<>(HttpStatus.OK); - } - - @Log("生成任务") - @ApiOperation("生成任务") - @PostMapping("/createTask") - public ResponseEntity createTask(@RequestBody JSONObject jsonObject) { - rgionioInService.createTask(jsonObject); - return new ResponseEntity<>(HttpStatus.OK); - } - -} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/rest/OutChargeController.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/rest/OutChargeController.java index 3d96595ca..0d67ac48e 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/rest/OutChargeController.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/rest/OutChargeController.java @@ -2,19 +2,15 @@ package org.nl.wms.st.inbill.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.OutChargeService; -import org.nl.wms.st.inbill.service.RegionioInService; -import org.nl.wms.st.inbill.service.dto.RegionioDto; import org.springframework.data.domain.Pageable; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import java.util.Map; diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/RegionioInService.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/RegionioInService.java deleted file mode 100644 index c9435d311..000000000 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/RegionioInService.java +++ /dev/null @@ -1,79 +0,0 @@ - -package org.nl.wms.st.inbill.service; - -import com.alibaba.fastjson.JSONObject; -import org.nl.wms.st.inbill.service.dto.RegionioDto; -import org.springframework.data.domain.Pageable; - -import java.util.List; -import java.util.Map; - -/** - * @author Liuxy - * @description 服务接口 - * @date 2022-08-11 - **/ -public interface RegionioInService { - - /** - * 查询数据分页 - * - * @param whereJson 条件 - * @param page 分页参数 - * @return Map - */ - Map queryAll(Map whereJson, Pageable page); - - /** - * 查询所有数据不分页 - * - * @param whereJson 条件参数 - * @return List - */ - List queryAll(Map whereJson); - - /** - * 根据ID查询 - * - * @param qty_unit_id ID - * @return Regionio - */ - RegionioDto findById(Long qty_unit_id); - - /** - * 根据编码查询 - * - * @param code code - * @return Regionio - */ - RegionioDto findByCode(String code); - - - /** - * 创建 - * - * @param dto / - */ - void create(RegionioDto dto); - - /** - * 编辑 - * - * @param dto / - */ - void update(RegionioDto dto); - - /** - * 多选删除 - * - * @param ids / - */ - void deleteAll(Long[] ids); - - /** - * 生成任务 - * - * @param jsonObject / - */ - void createTask(JSONObject jsonObject); -} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/OutChargeServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/OutChargeServiceImpl.java index 0d9975339..1248ebed8 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/OutChargeServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/OutChargeServiceImpl.java @@ -7,7 +7,6 @@ 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.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import lombok.RequiredArgsConstructor; @@ -17,20 +16,13 @@ import org.nl.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.SpringContextHolder; import org.nl.modules.wql.util.WqlUtil; import org.nl.wms.basedata.st.service.impl.UserStorServiceImpl; -import org.nl.wms.pdm.service.DeviceService; -import org.nl.wms.pdm.service.dto.DeviceDto; import org.nl.wms.st.inbill.service.OutChargeService; -import org.nl.wms.st.inbill.service.RegionioInService; -import org.nl.wms.st.inbill.service.dto.RegionioDto; 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; /** diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/RegionioInServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/RegionioInServiceImpl.java deleted file mode 100644 index 7e151e10d..000000000 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/RegionioInServiceImpl.java +++ /dev/null @@ -1,230 +0,0 @@ - -package org.nl.wms.st.inbill.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 com.alibaba.fastjson.JSON; -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.system.util.CodeUtil; -import org.nl.common.utils.SecurityUtils; -import org.nl.modules.wql.util.SpringContextHolder; -import org.nl.wms.pdm.service.DeviceService; -import org.nl.wms.pdm.service.dto.DeviceDto; -import org.nl.wms.st.inbill.service.RegionioInService; -import org.nl.wms.st.inbill.service.dto.RegionioDto; -import org.nl.modules.wql.WQL; -import org.nl.modules.wql.core.bean.WQLObject; -import org.nl.modules.wql.util.WqlUtil; -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; - -/** -* @description 服务实现 -* @author Liuxy -* @date 2022-08-11 -**/ -@Service -@RequiredArgsConstructor -@Slf4j -public class RegionioInServiceImpl implements RegionioInService { - - @Override - public Map queryAll(Map whereJson, Pageable page){ - String bill_code = MapUtil.getStr(whereJson, "bill_code"); - String vehicle_code = MapUtil.getStr(whereJson, "vehicle_code"); - String material_code = MapUtil.getStr(whereJson, "material_code"); - String pcsn = MapUtil.getStr(whereJson, "pcsn"); - String start_point_code = MapUtil.getStr(whereJson, "start_point_code"); - String end_point_code = MapUtil.getStr(whereJson, "end_point_code"); - String start_region_code = MapUtil.getStr(whereJson, "start_region_code"); - String end_region_code = MapUtil.getStr(whereJson, "end_region_code"); - - HashMap map = new HashMap<>(); - map.put("flag", "1"); - map.put("bill_status",MapUtil.getStr(whereJson, "bill_status")); - if (ObjectUtil.isNotEmpty(bill_code)) map.put("bill_code", bill_code + "%"); - if (ObjectUtil.isNotEmpty(vehicle_code)) map.put("vehicle_code", vehicle_code + "%"); - if (ObjectUtil.isNotEmpty(material_code)) map.put("material_code", material_code + "%"); - if (ObjectUtil.isNotEmpty(pcsn)) map.put("pcsn", pcsn + "%"); - if (ObjectUtil.isNotEmpty(start_point_code)) map.put("start_point_code", start_point_code + "%"); - if (ObjectUtil.isNotEmpty(end_point_code)) map.put("end_point_code", end_point_code + "%"); - if (ObjectUtil.isNotEmpty(start_region_code)) map.put("start_region_code", start_region_code + "%"); - if (ObjectUtil.isNotEmpty(end_region_code)) map.put("end_region_code", end_region_code + "%"); - - JSONObject json = WQL.getWO("ST_REGION_IN_01").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "ios.create_time DESC"); - return json; - } - - @Override - public List queryAll(Map whereJson){ - WQLObject wo = WQLObject.getWQLObject("st_ivt_regionio"); - JSONArray arr = wo.query().getResultJSONArray(0); - if (ObjectUtil.isNotEmpty(arr)) return arr.toJavaList(RegionioDto.class); - return null; - } - - @Override - public RegionioDto findById(Long qty_unit_id) { - WQLObject wo = WQLObject.getWQLObject("st_ivt_regionio"); - JSONObject json = wo.query("qty_unit_id = '" + qty_unit_id + "'").uniqueResult(0); - if (ObjectUtil.isNotEmpty(json)){ - return json.toJavaObject( RegionioDto.class); - } - return null; - } - - @Override - public RegionioDto findByCode(String code) { - WQLObject wo = WQLObject.getWQLObject("st_ivt_regionio"); - JSONObject json = wo.query("code ='" + code + "'").uniqueResult(0); - if (ObjectUtil.isNotEmpty(json)){ - return json.toJavaObject( RegionioDto.class); - } - return null; - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void create(RegionioDto dto) { - WQLObject materTab = WQLObject.getWQLObject("md_me_materialbase"); - WQLObject vehicleTab = WQLObject.getWQLObject("MD_PB_StorageVehicleInfo"); - JSONObject jsonMater = materTab.query("material_id = '" + dto.getMaterial_id() + "'").uniqueResult(0); - - if (ObjectUtil.isNotEmpty(dto.getVehicle_code())) { - JSONObject jsonVehicle = vehicleTab.query("storagevehicle_code = '" + dto.getVehicle_code() + "' and is_delete = '0' and is_used= '1'").uniqueResult(0); - if (ObjectUtil.isEmpty(jsonVehicle)) { - throw new BadRequestException("载具不存在"); - } - } - - String bill_code = CodeUtil.getNewCode("IN_STORE_CODE"); - String currentUserId = SecurityUtils.getCurrentUserId(); - String nickName = SecurityUtils.getCurrentNickName(); - String now = DateUtil.now(); - - dto.setIostorinv_id(IdUtil.getSnowflake(1, 1).nextId()); - dto.setBill_code(bill_code); - dto.setIo_type("0"); - dto.setBill_status("10"); - dto.setCreate_mode("01"); - 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.setQty_unit_id(jsonMater.getLongValue("base_unit_id")); - - WQLObject wo = WQLObject.getWQLObject("ST_IVT_regionIO"); - JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto)); - wo.insert(json); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void update(RegionioDto dto) { - RegionioDto entity = this.findById(dto.getQty_unit_id()); - if (entity == null) throw new BadRequestException("被删除或无权限，操作失败!"); - - WQLObject materTab = WQLObject.getWQLObject("md_me_materialbase"); - WQLObject vehicleTab = WQLObject.getWQLObject("MD_PB_StorageVehicleInfo"); - JSONObject jsonMater = materTab.query("material_id = '" + dto.getMaterial_id() + "'").uniqueResult(0); - - if (ObjectUtil.isNotEmpty(dto.getVehicle_code())) { - JSONObject jsonVehicle = vehicleTab.query("storagevehicle_code = '" + dto.getVehicle_code() + "' and is_delete = '0' and is_used= '1'").uniqueResult(0); - if (ObjectUtil.isEmpty(jsonVehicle)) { - throw new BadRequestException("载具不存在"); - } - } - - String currentUserId = SecurityUtils.getCurrentUserId(); - String nickName = SecurityUtils.getCurrentNickName(); - String now = DateUtil.now(); - dto.setBill_status("10"); - dto.setUpdate_time(now); - dto.setUpdate_optid(currentUserId); - dto.setUpdate_optname(nickName); - dto.setQty_unit_id(jsonMater.getLongValue("base_unit_id")); - - WQLObject wo = WQLObject.getWQLObject("ST_IVT_regionIO"); - JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto)); - wo.update(json); - - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void deleteAll(Long[] ids) { - String currentUserId = SecurityUtils.getCurrentUserId(); - String nickName = SecurityUtils.getCurrentNickName(); - String now = DateUtil.now(); - - WQLObject wo = WQLObject.getWQLObject("st_ivt_regionio"); - for (Long iostorinv_id: ids) { - JSONObject param = wo.query("iostorinv_id = '" + String.valueOf(iostorinv_id) + "'").uniqueResult(0); - 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 createTask(JSONObject jsonObject) { - String iostorinv_id = jsonObject.getString("iostorinv_id"); - - WQLObject wo = WQLObject.getWQLObject("ST_IVT_regionIO"); - WQLObject orderTab = WQLObject.getWQLObject("mps_bd_produceshiftorder"); - - JSONObject jsonIn = wo.query("iostorinv_id = '" + iostorinv_id + "'").uniqueResult(0); - String start_point_code = jsonIn.getString("start_point_code"); - - // 准备参数 并调用入库处理类中的创建任务方法 - JSONObject form = new JSONObject(); - form.put("vehicle_code", jsonIn.getString("vehicle_code")); - form.put("start_point_code", start_point_code); - form.put("next_point_code", jsonIn.getString("end_point_code")); - form.put("material_id", jsonIn.getString("material_id")); - form.put("qty", jsonIn.getString("qty")); - form.put("cust_id", jsonIn.getString("cust_id")); - form.put("create_mode", jsonIn.getString("create_mode")); - form.put("pcsn", jsonIn.getString("pcsn")); - form.put("iostorinv_id", iostorinv_id); - - // 根据起点点位 找到对应设备，根据设备找到对应工单，根据工单获取载具类型 - String device_code = start_point_code.substring(0, start_point_code.indexOf("_")); - - DeviceService deviceBean = SpringContextHolder.getBean(DeviceService.class); - DeviceDto deviceDto = deviceBean.findByCode(device_code); - if (ObjectUtil.isEmpty(deviceDto)) throw new BadRequestException("此设备不存在"); - JSONObject jsonOrder = orderTab.query("device_id = '" + deviceDto.getDevice_id() + "' and order_status = '02' and is_delete = '0'").uniqueResult(0); - if (ObjectUtil.isEmpty(jsonOrder)) throw new BadRequestException("此设备未在生产中或不存在"); - - form.put("vehicle_type", jsonOrder.getString("vehicle_type")); -// SendMaterialTask sendMaterialTask = new SendMaterialTask(); -// String task_id = sendMaterialTask.createTask(form); - - JSONObject json = new JSONObject(); -// json.put("task_id", task_id); - json.put("update_optid", SecurityUtils.getCurrentUserId()); - json.put("update_optname", SecurityUtils.getCurrentNickName()); - json.put("update_time", DateUtil.now()); - json.put("bill_status", "20"); - wo.update(json, "iostorinv_id = '" + iostorinv_id + "'"); - } - -} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/stat/rest/InBillQueryController.java b/lms/nladmin-system/src/main/java/org/nl/wms/stat/rest/InBillQueryController.java index 45dc49b4e..5fa3fd9ca 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/stat/rest/InBillQueryController.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/stat/rest/InBillQueryController.java @@ -37,8 +37,8 @@ public class InBillQueryController { @GetMapping @Log("查询") @ApiOperation("查询") - public ResponseEntity query(@RequestParam Map whereJson, Pageable page) { - return new ResponseEntity<>(inBillQueryService.queryAll(whereJson, page), HttpStatus.OK); + public ResponseEntity query(@RequestParam Map whereJson, Pageable page, String[] product_area) { + return new ResponseEntity<>(inBillQueryService.queryAll(whereJson, page, product_area), HttpStatus.OK); } @PostMapping @@ -68,7 +68,7 @@ public class InBillQueryController { @Log("导出数据") @ApiOperation("导出数据") @GetMapping(value = "/download") - public void download(@RequestParam Map map, HttpServletResponse response) throws IOException { - inBillQueryService.download(map, response); + public void download(@RequestParam Map map, HttpServletResponse response, String[] product_area) throws IOException { + inBillQueryService.download(map, response, product_area); } } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/stat/service/InBillQueryService.java b/lms/nladmin-system/src/main/java/org/nl/wms/stat/service/InBillQueryService.java index 31580988e..af2a08899 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/stat/service/InBillQueryService.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/stat/service/InBillQueryService.java @@ -11,8 +11,8 @@ import java.util.List; import java.util.Map; /** - * @description 服务接口 * @author Liuxy + * @description 服务接口 * @date 2023-04-07 **/ public interface InBillQueryService { @@ -24,7 +24,7 @@ public interface InBillQueryService { * @param page 分页参数 * @return Map */ - Map queryAll(Map whereJson, Pageable page); + Map queryAll(Map whereJson, Pageable page, String[] product_area); /** * 查询所有数据不分页 @@ -55,5 +55,5 @@ public interface InBillQueryService { */ void deleteAll(Long[] ids); - void download(Map map, HttpServletResponse response) throws IOException; + void download(Map map, HttpServletResponse response, String[] product_area) throws IOException; } \ No newline at end of file diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/stat/service/impl/InBillQueryServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/stat/service/impl/InBillQueryServiceImpl.java index e35751ffd..7fc5816d1 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/stat/service/impl/InBillQueryServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/stat/service/impl/InBillQueryServiceImpl.java @@ -41,21 +41,43 @@ public class InBillQueryServiceImpl implements InBillQueryService { @Override - public Map queryAll(Map whereJson, Pageable page) { + public Map queryAll(Map whereJson, Pageable page, String[] product_area) { String stor_id = MapUtil.getStr(whereJson, "stor_id"); String bill_type = MapUtil.getStr(whereJson, "bill_type"); String with = MapUtil.getStr(whereJson, "with"); // 厚度*幅宽 String begin_time = MapUtil.getStr(whereJson, "begin_time"); String end_time = MapUtil.getStr(whereJson, "end_time"); + String is_virtual = MapUtil.getStr(whereJson, "is_virtual"); + String classes = MapUtil.getStr(whereJson, "classes"); + String is_all = MapUtil.getStr(whereJson, "is_all"); + String thickness_request = MapUtil.getStr(whereJson, "thickness_request"); JSONObject map = new JSONObject(); - map.put("flag", "1"); - map.put("stor_id",stor_id); - map.put("bill_type",bill_type); - map.put("with",with); - map.put("begin_time",begin_time); - map.put("end_time",end_time); + if ("0".equals(is_all)) { + map.put("flag", "1"); + } else { + map.put("flag", "2"); + } + map.put("stor_id", stor_id); + map.put("bill_type", bill_type); + map.put("with", with); + map.put("begin_time", begin_time); + map.put("end_time", end_time); + map.put("is_virtual", is_virtual); + map.put("classes", classes); + map.put("thickness_request", thickness_request); + if (ObjectUtil.isNotEmpty(product_area)) { + String areas = "("; + for (int i = 0; i < product_area.length; i++) { + if (i != product_area.length - 1) { + areas += "'" + product_area[i] + "',"; + } else { + areas += "'" + product_area[i] + "')"; + } + } + map.put("areas", areas); + } JSONObject json = WQL.getWO("ST_IVT_INBILLQUERY").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "mst.input_time DESC,dis.box_no"); return json; } @@ -98,49 +120,95 @@ public class InBillQueryServiceImpl implements InBillQueryService { } @Override - public void download(Map map, HttpServletResponse response) throws IOException { + public void download(Map map, HttpServletResponse response, String[] product_area) throws IOException { String stor_id = MapUtil.getStr(map, "stor_id"); String bill_type = MapUtil.getStr(map, "bill_type"); String with = MapUtil.getStr(map, "with"); // 厚度*幅宽 String begin_time = MapUtil.getStr(map, "begin_time"); String end_time = MapUtil.getStr(map, "end_time"); + String is_virtual = MapUtil.getStr(map, "is_virtual"); + String classes = MapUtil.getStr(map, "classes"); + String is_all = MapUtil.getStr(map, "is_all"); + String thickness_request = MapUtil.getStr(map, "thickness_request"); JSONObject mapParam = new JSONObject(); - mapParam.put("flag", "1"); - mapParam.put("stor_id",stor_id); - mapParam.put("bill_type",bill_type); - mapParam.put("with",with); - mapParam.put("begin_time",begin_time); - mapParam.put("end_time",end_time); + if ("0".equals(is_all)) { + mapParam.put("flag", "1"); + } else { + mapParam.put("flag", "2"); + } + mapParam.put("stor_id", stor_id); + mapParam.put("bill_type", bill_type); + mapParam.put("with", with); + mapParam.put("begin_time", begin_time); + mapParam.put("end_time", end_time); + mapParam.put("is_virtual", is_virtual); + mapParam.put("classes", classes); + mapParam.put("thickness_request", thickness_request); + + if (ObjectUtil.isNotEmpty(product_area)) { + String areas = "("; + for (int i = 0; i < product_area.length; i++) { + if (i != product_area.length - 1) { + areas += "'" + product_area[i] + "',"; + } else { + areas += "'" + product_area[i] + "')"; + } + } + mapParam.put("areas", areas); + } JSONArray resultJSONArray = WQL.getWO("ST_IVT_INBILLQUERY").addParamMap(mapParam).process().getResultJSONArray(0); List> list = new ArrayList<>(); - for (int i = 0; i < resultJSONArray.size(); i++) { - JSONObject json = resultJSONArray.getJSONObject(i); - Map mp = new LinkedHashMap<>(); - - mp.put("仓库", json.getString("stor_name")); - mp.put("库区", json.getString("sect_name")); - mp.put("仓位编码", json.getString("struct_code")); - mp.put("仓位名称", json.getString("struct_name")); - mp.put("木箱号", json.getString("box_no")); - mp.put("物料编码", json.getString("material_code")); - mp.put("物料名称", json.getString("material_name")); - mp.put("子卷号", json.getString("pcsn")); - mp.put("sap批次", json.getString("sap_pcsn")); - mp.put("净重", json.getString("net_weight")); - mp.put("单位", json.getString("qty_unit_name")); - mp.put("客户编码", json.getString("customer_name")); - mp.put("客户名称", json.getString("customer_description")); - mp.put("销售订单", json.getString("sale_order_name")); - mp.put("入库日期", json.getString("input_time")); - mp.put("生产日期", json.getString("date_of_production")); - mp.put("产品规格", json.getString("width")); - mp.put("产品厚度", json.getString("thickness")); - mp.put("单位面积", json.getString("mass_per_unit_area")); - mp.put("制单人", json.getString("input_optname")); - mp.put("备注", json.getString("remark")); - list.add(mp); + if ("0".equals(is_all)){ + for (int i = 0; i < resultJSONArray.size(); i++) { + JSONObject json = resultJSONArray.getJSONObject(i); + Map mp = new LinkedHashMap<>(); + mp.put("日期", (json.getString("confirm_time").substring(0,10)).replace("-","/")); + mp.put("班次", json.getString("classes")); + mp.put("客户代码", json.getString("sale_order_name")); + mp.put("规格", json.getString("thickness_request")); + mp.put("尺寸（mm）（客户要求幅宽）", json.getString("width_standard")); + mp.put("实际尺寸（mm）（实际幅宽）", json.getString("width")); + String box_name = json.getString("box_name"); + if (StrUtil.isNotEmpty(box_name)){ + String[] s = box_name.split("木箱"); + String s1 = s[1]; + String[] split = s1.split("\\|"); + mp.put("木箱规格/尺寸", split[1]+"*"+split[2]); + }else { + mp.put("木箱规格/尺寸", ""); + } + mp.put("毛重合计", json.getString("box_weight")); + mp.put("净重（KG）", json.getString("net_weight")); + mp.put("卷数", json.getString("quanlity_in_box")); + mp.put("品级", "A"); + mp.put("小卷号", json.getString("pcsn")); + mp.put("箱号", json.getString("box_no")); + mp.put("母卷号", json.getString("parent_container_name")); + mp.put("基重（g/m³）（面密度）", json.getString("mass_per_unit_area")); + mp.put("居中度（mm）", "±1"); + mp.put("塌边（mm）", "≤10"); + mp.put("米数（长度）", json.getString("length")); + mp.put("生产日期", json.getString("date_of_production").replace("-","/")); + mp.put("入库日期", json.getString("confirm_time").substring(0,10).replace("-","/")); + list.add(mp); + } + }else { + for (int i = 0; i < resultJSONArray.size(); i++) { + JSONObject json = resultJSONArray.getJSONObject(i); + Map mp = new LinkedHashMap<>(); + mp.put("客户编码", json.getString("customer_name")); + mp.put("客户订单号", json.getString("sale_order_name")); + mp.put("生产日期", json.getString("date_of_production").replace("-","/")); + mp.put("箱号", json.getString("box_no")); + mp.put("生产批号", (json.getString("confirm_time").substring(0,10)).replace("-","").trim()); + mp.put("规格", json.getString("specification")); + mp.put("净重", json.getString("net_weight")); + mp.put("等级", "A"); + mp.put("备注", ""); + list.add(mp); + } } FileUtil.downloadExcel(list, response); } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/stat/wql/ST_IVT_INBILLQUERY.wql b/lms/nladmin-system/src/main/java/org/nl/wms/stat/wql/ST_IVT_INBILLQUERY.wql index 61b6d31b2..d95c09dd0 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/stat/wql/ST_IVT_INBILLQUERY.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/stat/wql/ST_IVT_INBILLQUERY.wql @@ -19,6 +19,10 @@ 输入.with TYPEAS s_string 输入.begin_time TYPEAS s_string 输入.end_time TYPEAS s_string + 输入.is_virtual TYPEAS s_string + 输入.classes TYPEAS s_string + 输入.thickness_request TYPEAS s_string + 输入.areas TYPEAS f_string [临时表] @@ -54,25 +58,42 @@ dis.box_no, mater.material_code, mater.material_name, + mb.material_name AS box_name, dis.pcsn, sub.sap_pcsn, sub.net_weight, dis.qty_unit_name, sub.customer_name, + sub.quanlity_in_box, sub.customer_description, sub.sale_order_name, mst.input_time, + mst.confirm_time, sub.date_of_production, mst.input_optname, sub.width, sub.thickness, + sub.box_weight, + sub.length, + sub.thickness_request, + sub.width_standard, sub.mass_per_unit_area, - mst.remark + (case when plan.parent_container_name <> '' then plan.parent_container_name else plan.restruct_container_name end) AS parent_container_name, + mst.remark, + (case when DATE_FORMAT( mst.confirm_time, '%H:%i:%s' ) >='08:00:00' AND DATE_FORMAT( mst.confirm_time, '%H:%i:%s' ) <= '19:59:59' then '白班' + when (( + DATE_FORMAT( mst.confirm_time, '%H:%i:%s' ) >='20:00:00' AND DATE_FORMAT( mst.confirm_time, '%H:%i:%s' ) <= '23:59:59' + OR + DATE_FORMAT( mst.confirm_time, '%H:%i:%s' ) >='00:00:00' AND DATE_FORMAT( mst.confirm_time, '%H:%i:%s' ) <= '07:59:59' + )) then '晚班' end) AS classes FROM st_ivt_iostorinvdis dis LEFT JOIN st_ivt_iostorinv mst ON mst.iostorinv_id = dis.iostorinv_id + LEFT JOIN st_ivt_sectattr sect ON sect.sect_id = dis.sect_id LEFT JOIN md_me_materialbase mater ON mater.material_id = dis.material_id LEFT JOIN pdm_bi_subpackagerelation sub ON sub.container_name = dis.pcsn AND sub.package_box_sn = dis.box_no + LEFT JOIN pdm_bi_slittingproductionplan plan ON plan.container_name = sub.container_name + LEFT JOIN md_me_materialbase mb ON mb.material_code = sub.box_type WHERE mst.io_type = '0' AND mst.is_delete = '0' @@ -82,6 +103,18 @@ mst.stor_id = 输入.stor_id ENDOPTION + OPTION 输入.is_virtual = "0" + sect.sect_type_attr <> '09' + ENDOPTION + OPTION 输入.is_virtual = "1" + sect.sect_type_attr = '09' + ENDOPTION + OPTION 输入.areas <> "" + LEFT(sub.container_name,2) IN 输入.areas + ENDOPTION + OPTION 输入.thickness_request <> "" + sub.thickness_request = 输入.thickness_request + ENDOPTION OPTION 输入.bill_type <> "" mst.bill_type = 输入.bill_type ENDOPTION @@ -95,9 +128,105 @@ ENDOPTION OPTION 输入.with <> "" - CONCAT(sub.width,'*',sub.thickness) = 输入.with + CONCAT(sub.width,'*',sub.thickness_request) = 输入.with + ENDOPTION + + OPTION 输入.classes = "1" + DATE_FORMAT( mst.confirm_time, '%H:%i:%s' ) >='08:00:00' AND DATE_FORMAT( mst.confirm_time, '%H:%i:%s' ) <= '19:59:59' + ENDOPTION + + OPTION 输入.classes = "2" + ( + DATE_FORMAT( mst.confirm_time, '%H:%i:%s' ) >='20:00:00' AND DATE_FORMAT( mst.confirm_time, '%H:%i:%s' ) <= '23:59:59' + OR + DATE_FORMAT( mst.confirm_time, '%H:%i:%s' ) >='00:00:00' AND DATE_FORMAT( mst.confirm_time, '%H:%i:%s' ) <= '07:59:59' + ) ENDOPTION ENDSELECT ENDPAGEQUERY - ENDIF \ No newline at end of file + ENDIF + + IF 输入.flag = "2" + PAGEQUERY + SELECT + MAX(mst.stor_name) AS stor_name, + MAX(dis.sect_name) AS sect_name, + MAX(dis.struct_code) AS struct_code, + MAX(dis.struct_name) AS struct_name, + MAX(mst.bill_type) AS bill_type, + MAX(mater.material_code) AS material_code, + MAX(mater.material_name) AS material_name, + MAX(dis.qty_unit_name) AS qty_unit_name, + MAX(sub.customer_description) AS customer_description, + MAX(mst.input_optname) AS input_optname, + MAX(mst.remark) AS remark, + mst.iostorinv_id, + dis.box_no, + MAX(sub.customer_name) AS customer_name, + MAX(sub.sale_order_name) AS sale_order_name, + MAX(sub.date_of_production) AS date_of_production, + SUM(sub.net_weight) AS net_weight, + MAX(mst.input_time) AS input_time, + MAX(mst.confirm_time) AS confirm_time, + CONCAT_WS('',MAX(sub.thickness_request),'*',MAX(sub.width)) AS specification + FROM + st_ivt_iostorinvdis dis + LEFT JOIN st_ivt_iostorinv mst ON mst.iostorinv_id = dis.iostorinv_id + LEFT JOIN st_ivt_sectattr sect ON sect.sect_id = dis.sect_id + LEFT JOIN md_me_materialbase mater ON mater.material_id = dis.material_id + LEFT JOIN pdm_bi_subpackagerelation sub ON sub.container_name = dis.pcsn AND sub.package_box_sn = dis.box_no + WHERE + mst.io_type = '0' + AND mst.is_delete = '0' + AND mst.bill_status = '99' + + OPTION 输入.stor_id <> "" + mst.stor_id = 输入.stor_id + ENDOPTION + + OPTION 输入.is_virtual = "0" + sect.sect_type_attr <> '09' + ENDOPTION + OPTION 输入.is_virtual = "1" + sect.sect_type_attr = '09' + ENDOPTION + OPTION 输入.areas <> "" + LEFT(sub.container_name,2) IN 输入.areas + ENDOPTION + OPTION 输入.thickness_request <> "" + sub.thickness_request = 输入.thickness_request + ENDOPTION + OPTION 输入.bill_type <> "" + mst.bill_type = 输入.bill_type + ENDOPTION + + OPTION 输入.begin_time <> "" + mst.input_time >= 输入.begin_time + ENDOPTION + + OPTION 输入.end_time <> "" + mst.input_time <= 输入.end_time + ENDOPTION + + OPTION 输入.with <> "" + CONCAT(sub.width,'*',sub.thickness_request) = 输入.with + ENDOPTION + + OPTION 输入.classes = "1" + DATE_FORMAT( mst.confirm_time, '%H:%i:%s' ) >='08:00:00' AND DATE_FORMAT( mst.confirm_time, '%H:%i:%s' ) <= '19:59:59' + ENDOPTION + + OPTION 输入.classes = "2" + ( + DATE_FORMAT( mst.confirm_time, '%H:%i:%s' ) >='20:00:00' AND DATE_FORMAT( mst.confirm_time, '%H:%i:%s' ) <= '23:59:59' + OR + DATE_FORMAT( mst.confirm_time, '%H:%i:%s' ) >='00:00:00' AND DATE_FORMAT( mst.confirm_time, '%H:%i:%s' ) <= '07:59:59' + ) + ENDOPTION + GROUP BY + mst.iostorinv_id, + dis.box_no + ENDSELECT + ENDPAGEQUERY + ENDIF \ No newline at end of file diff --git a/lms/nladmin-ui/src/views/wms/basedata/master/interfaceback/index.vue b/lms/nladmin-ui/src/views/wms/basedata/master/interfaceback/index.vue index 81b833eb6..dc61e9784 100644 --- a/lms/nladmin-ui/src/views/wms/basedata/master/interfaceback/index.vue +++ b/lms/nladmin-ui/src/views/wms/basedata/master/interfaceback/index.vue @@ -67,7 +67,27 @@ - + + + + + + + + + @@ -118,11 +138,12 @@ const defaultForm = { interface_name: null, remark: null, is_back: null, - business_comment: null + business_comment: null, + product_area: null } export default { name: 'Interfaceback', - dicts: ['INTERFACEBACK_TYPE', 'is_upload'], + dicts: ['INTERFACEBACK_TYPE', 'is_upload', 'product_area'], components: { pagination, crudOperation, rrOperation, udOperation }, mixins: [presenter(), header(), form(defaultForm), crud()], cruds() { diff --git a/lms/nladmin-ui/src/views/wms/basedata/product/userArea/index.vue b/lms/nladmin-ui/src/views/wms/basedata/product/userArea/index.vue new file mode 100644 index 000000000..cd52b73a7 --- /dev/null +++ b/lms/nladmin-ui/src/views/wms/basedata/product/userArea/index.vue @@ -0,0 +1,323 @@ + + + + + + + diff --git a/lms/nladmin-ui/src/views/wms/basedata/product/userArea/userArea.js b/lms/nladmin-ui/src/views/wms/basedata/product/userArea/userArea.js new file mode 100644 index 000000000..025b0f4e7 --- /dev/null +++ b/lms/nladmin-ui/src/views/wms/basedata/product/userArea/userArea.js @@ -0,0 +1,43 @@ +import request from '@/utils/request' + +export function queryStor(data) { + return request({ + url: '/api/userArea/queryStor', + method: 'post', + data + }) +} + +export function queryUserArea(data) { + return request({ + url: '/api/userArea/queryUserArea', + method: 'post', + data + }) +} + +export function save(data) { + return request({ + url: '/api/userArea/save', + method: 'post', + data + }) +} + +export function getuserArea(data) { + return request({ + url: '/api/userArea/getuserArea', + method: 'post', + data + }) +} + +export function getSect(data) { + return request({ + url: '/api/userArea/getSect', + method: 'post', + data + }) +} + +export default { queryUserArea, queryStor, save, getuserArea, getSect } diff --git a/lms/nladmin-ui/src/views/wms/basedata/st/ivt/index.vue b/lms/nladmin-ui/src/views/wms/basedata/st/ivt/index.vue index 69c1700b3..c7dab74a9 100644 --- a/lms/nladmin-ui/src/views/wms/basedata/st/ivt/index.vue +++ b/lms/nladmin-ui/src/views/wms/basedata/st/ivt/index.vue @@ -99,6 +99,41 @@ /> + + + + + + + + + + + @@ -160,7 +195,7 @@ import { downloadFile } from '@/utils' const defaultForm = { stockrecord_id: null, cascader: null, struct_id: null, struct_code: null, struct_name: null, workprocedure_id: null, material_id: null, material_code: null, quality_scode: null, pcsn: null, canuse_qty: null, frozen_qty: null, ivt_qty: null, warehousing_qty: null, qty_unit_id: null, instorage_time: null, sale_id: null } export default { name: 'Structivt', - dicts: ['ST_QUALITY_SCODE'], + dicts: ['ST_QUALITY_SCODE', 'product_area', 'IS_OR_NOT'], components: { pagination, crudOperation, rrOperation, udOperation }, mixins: [presenter(), header(), form(defaultForm), crud()], cruds() { @@ -203,6 +238,8 @@ export default { return true }, hand(value) { + console.log(value) + debugger this.crud.toQuery() }, sectQueryChange(val) { diff --git a/lms/nladmin-ui/src/views/wms/pdm/base/routing/AddDialog.vue b/lms/nladmin-ui/src/views/wms/pdm/base/routing/AddDialog.vue deleted file mode 100644 index ac7b8ddc6..000000000 --- a/lms/nladmin-ui/src/views/wms/pdm/base/routing/AddDialog.vue +++ /dev/null @@ -1,274 +0,0 @@ - - - - - - - diff --git a/lms/nladmin-ui/src/views/wms/pdm/base/routing/index.vue b/lms/nladmin-ui/src/views/wms/pdm/base/routing/index.vue deleted file mode 100644 index d7b0d999b..000000000 --- a/lms/nladmin-ui/src/views/wms/pdm/base/routing/index.vue +++ /dev/null @@ -1,187 +0,0 @@ - - - - - diff --git a/lms/nladmin-ui/src/views/wms/pdm/base/routing/processroute.js b/lms/nladmin-ui/src/views/wms/pdm/base/routing/processroute.js deleted file mode 100644 index b28bd9c9e..000000000 --- a/lms/nladmin-ui/src/views/wms/pdm/base/routing/processroute.js +++ /dev/null @@ -1,58 +0,0 @@ -import request from '@/utils/request' - -export function add(data) { - return request({ - url: 'api/processroute', - method: 'post', - data - }) -} - -export function del(ids) { - return request({ - url: 'api/processroute/', - method: 'delete', - data: ids - }) -} - -export function edit(data) { - return request({ - url: 'api/processroute', - method: 'put', - data - }) -} - -export function getWorkList() { - return request({ - url: 'api/processroute/getWorkList', - method: 'get' - }) -} - -export function getDtl(params) { - return request({ - url: 'api/processroute/getDtl', - method: 'get', - params - }) -} - -export function submit(data) { - return request({ - url: 'api/processroute/submit', - method: 'put', - data - }) -} - -export function CancelSubmit(data) { - return request({ - url: 'api/processroute/CancelSubmit', - method: 'put', - data - }) -} - -export default { add, edit, del, getWorkList, getDtl, submit, CancelSubmit } diff --git a/lms/nladmin-ui/src/views/wms/pdm/base/workProcedure/index.vue b/lms/nladmin-ui/src/views/wms/pdm/base/workProcedure/index.vue deleted file mode 100644 index f29f90b4b..000000000 --- a/lms/nladmin-ui/src/views/wms/pdm/base/workProcedure/index.vue +++ /dev/null @@ -1,189 +0,0 @@ - - - - - diff --git a/lms/nladmin-ui/src/views/wms/pdm/base/workProcedure/workProcedure.js b/lms/nladmin-ui/src/views/wms/pdm/base/workProcedure/workProcedure.js deleted file mode 100644 index 3cc498fc3..000000000 --- a/lms/nladmin-ui/src/views/wms/pdm/base/workProcedure/workProcedure.js +++ /dev/null @@ -1,33 +0,0 @@ -import request from '@/utils/request' - -export function add(data) { - return request({ - url: 'api/workProcedure', - method: 'post', - data - }) -} - -export function del(ids) { - return request({ - url: 'api/workProcedure/', - method: 'delete', - data: ids - }) -} - -export function edit(data) { - return request({ - url: 'api/workProcedure', - method: 'put', - data - }) -} - -export function downSelect() { - return request({ - url: 'api/workProcedure/downSelect' - }) -} - -export default { add, edit, del, downSelect } diff --git a/lms/nladmin-ui/src/views/wms/pdm/order/slittingplan/index.vue b/lms/nladmin-ui/src/views/wms/pdm/order/slittingplan/index.vue index 0489385d5..b8120a7b3 100644 --- a/lms/nladmin-ui/src/views/wms/pdm/order/slittingplan/index.vue +++ b/lms/nladmin-ui/src/views/wms/pdm/order/slittingplan/index.vue @@ -458,7 +458,7 @@ - + @@ -144,16 +219,18 @@ export default { optShow: { add: false, reset: true }, idField: 'iostorinv_id', url: '/api/in/InQuery', + query: { 'is_all': '0' }, crudMethod: { ...crudInbillquery } }) }, mixins: [presenter(), header(), crud()], // 数据字典 - dicts: ['io_bill_status', 'ST_INV_IN_TYPE'], + dicts: ['io_bill_status', 'ST_INV_IN_TYPE', 'product_area', 'IS_OR_NOT'], data() { return { height: document.documentElement.clientHeight - 180 + 'px;', storlist: [], + classes: [{ 'id': '1', 'code': '白班' }, { 'id': '2', 'code': '晚班' }], showDtlLoading: false } }, @@ -175,11 +252,7 @@ export default { downdtl() { if (this.currentRow !== null) { crud.downloadLoading = true - const data = { - 'stor_id': this.crud.query.stor_id, - 'bill_type': this.crud.query.bill_type, - 'with': this.crud.query.with - } + const data = this.crud.query if (this.crud.query.createTime !== undefined) { data.begin_time = this.crud.query.createTime[0] data.end_time = this.crud.query.createTime[1]