From 8b767c2a85815dad5bbc338a95881546b2973063 Mon Sep 17 00:00:00 2001 From: "USER-20220102CG\\noblelift" <546428999@qq.com> Date: Tue, 31 May 2022 10:20:17 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../HaiLiangFeedingTrunkDeviceDriver.java | 63 +++- .../ProduceshiftorderdetailController.java | 76 +++++ .../service/ProduceshiftorderService.java | 11 +- .../ProduceshiftorderdetailService.java | 87 +++++ .../dto/ProduceshiftorderdetailDto.java | 4 + .../impl/ProduceshiftorderServiceImpl.java | 51 +-- .../ProduceshiftorderdetailServiceImpl.java | 299 ++++++++++++++++++ .../org/nl/acs/order/service/wql/order.xls | Bin 191488 -> 191488 bytes .../run/LetteringSocketConnectionAutoRun.java | 21 +- 9 files changed, 552 insertions(+), 60 deletions(-) create mode 100644 nladmin-system/src/main/java/org/nl/acs/order/rest/ProduceshiftorderdetailController.java create mode 100644 nladmin-system/src/main/java/org/nl/acs/order/service/ProduceshiftorderdetailService.java create mode 100644 nladmin-system/src/main/java/org/nl/acs/order/service/impl/ProduceshiftorderdetailServiceImpl.java diff --git a/nladmin-system/src/main/java/org/nl/acs/device_driver/hailiang/hailiang_feeding_trunk/HaiLiangFeedingTrunkDeviceDriver.java b/nladmin-system/src/main/java/org/nl/acs/device_driver/hailiang/hailiang_feeding_trunk/HaiLiangFeedingTrunkDeviceDriver.java index 641d041..d06d964 100644 --- a/nladmin-system/src/main/java/org/nl/acs/device_driver/hailiang/hailiang_feeding_trunk/HaiLiangFeedingTrunkDeviceDriver.java +++ b/nladmin-system/src/main/java/org/nl/acs/device_driver/hailiang/hailiang_feeding_trunk/HaiLiangFeedingTrunkDeviceDriver.java @@ -10,8 +10,11 @@ import org.nl.acs.device_driver.driver.AbstractOpcDeviceDriver; import org.nl.acs.device_driver.driver.ExecutableDeviceDriver; import org.nl.acs.opc.Device; import org.nl.acs.order.service.ProduceshiftorderService; +import org.nl.acs.order.service.ProduceshiftorderdetailService; import org.nl.acs.order.service.dto.ProduceshiftorderDto; +import org.nl.acs.order.service.dto.ProduceshiftorderdetailDto; import org.nl.exception.BadRequestException; +import org.nl.utils.SpringContextHolder; import org.openscada.opc.lib.da.Server; import org.springframework.beans.factory.annotation.Autowired; @@ -28,7 +31,10 @@ public class HaiLiangFeedingTrunkDeviceDriver extends AbstractOpcDeviceDriver im protected ItemProtocol itemProtocol = new ItemProtocol(this); @Autowired - ProduceshiftorderService produceshiftorderService; + ProduceshiftorderService produceshiftorderService = SpringContextHolder.getBean(ProduceshiftorderService.class); + + @Autowired + ProduceshiftorderdetailService produceshiftorderdetailService = SpringContextHolder.getBean(ProduceshiftorderdetailService.class); @Override public Device getDevice() { @@ -47,6 +53,8 @@ public class HaiLiangFeedingTrunkDeviceDriver extends AbstractOpcDeviceDriver im int ready = 0; int pause = 0; int clear = 0; + Boolean send_letter_flag_back = false; + Boolean send_letter_flag = false; @Override public void execute() throws Exception { @@ -88,11 +96,15 @@ public class HaiLiangFeedingTrunkDeviceDriver extends AbstractOpcDeviceDriver im break; case 3: //申请工单 - apply_order(); + if(!requireSucess && ready == 1 ){ + apply_order(); + } break; case 4: //申请工单明细 - apply_orderDetail(); + if(!requireSucess && ready == 1 && order != 0 ) { + apply_orderDetail(order); + } break; } } @@ -120,6 +132,7 @@ public class HaiLiangFeedingTrunkDeviceDriver extends AbstractOpcDeviceDriver im String wall_thickness = dto.getWall_thickness(); String length = dto.getLength(); String qty = dto.getQty(); + writing(ItemProtocol.item_to_order,order); writing(ItemProtocol.item_to_order_feeding_qty,qty); writing(ItemProtocol.item_to_outer_diameter,outer_diameter); @@ -130,14 +143,52 @@ public class HaiLiangFeedingTrunkDeviceDriver extends AbstractOpcDeviceDriver im writing(ItemProtocol.item_to_is_strapping,is_strapping); writing(ItemProtocol.item_to_is_coating,is_coating); writing(ItemProtocol.item_to_is_lettering,is_lettering); + writing(ItemProtocol.item_to_command,String.valueOf(mode)); + dto.setOrder_status("02"); produceshiftorderService.update(dto); - + requireSucess = true; return true; } - public boolean apply_orderDetail() throws Exception { + public boolean apply_orderDetail(int order) throws Exception { + ProduceshiftorderdetailDto dto = produceshiftorderdetailService.apply_orderDetail(String.valueOf(order)); + if(ObjectUtil.isEmpty(dto)){ + throw new BadRequestException("未找到可下发工单明细!"); + } + String orderDetail = dto.getOrder_detail_code(); + String feeding_qty = dto.getFeeding_qty(); + String strap_pack_number = dto.getStrap_pack_number(); + String strap_number = dto.getStrap_number(); + String str = dto.getLabeling_message(); + //判断是否最后一个客户 + boolean last_detail = produceshiftorderdetailService.isLastOrderDetail(String.valueOf(order)); + + //下发激光刻字信息 + //判断下发刻字成功 + if(!send_letter_flag){ + send_letter_flag = produceshiftorderdetailService.sendLetteringMess(str); + } + if(send_letter_flag_back) { + if(last_detail){ + writing(ItemProtocol.item_to_is_last,"1"); + } else { + writing(ItemProtocol.item_to_is_last,"0"); + } + writing(ItemProtocol.item_to_order_detail,orderDetail); + writing(ItemProtocol.item_to_detail_feeding_qty,feeding_qty); + writing(ItemProtocol.item_to_strapping_qty,strap_pack_number); + writing(ItemProtocol.item_to_one_strapping_qty,strap_number); + writing(ItemProtocol.item_to_coating_qty,strap_pack_number); + writing(ItemProtocol.item_to_labeling_qty,strap_pack_number); + writing(ItemProtocol.item_to_command,String.valueOf(mode)); + dto.setOrder_detail_status("01"); + produceshiftorderdetailService.update(dto); + send_letter_flag = false; + send_letter_flag_back = false; + requireSucess = true; + } return true; } @@ -148,7 +199,7 @@ public class HaiLiangFeedingTrunkDeviceDriver extends AbstractOpcDeviceDriver im String opcservcerid = this.getDevice().getOpc_server_id(); Server server = ReadUtil.getServer(opcservcerid); Map itemMap = new HashMap(); - itemMap.put(to_param, Integer.parseInt(value)); + itemMap.put(to_param, Double.parseDouble(value)); ReadUtil.write(itemMap, server); } diff --git a/nladmin-system/src/main/java/org/nl/acs/order/rest/ProduceshiftorderdetailController.java b/nladmin-system/src/main/java/org/nl/acs/order/rest/ProduceshiftorderdetailController.java new file mode 100644 index 0000000..4a13bf1 --- /dev/null +++ b/nladmin-system/src/main/java/org/nl/acs/order/rest/ProduceshiftorderdetailController.java @@ -0,0 +1,76 @@ + +package org.nl.acs.order.rest; + + +import org.nl.acs.order.service.ProduceshiftorderdetailService; +import org.nl.acs.order.service.dto.ProduceshiftorderdetailDto; +import org.springframework.data.domain.Pageable; +import lombok.RequiredArgsConstructor; +import org.nl.annotation.Log; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.*; +import java.io.IOException; +import javax.servlet.http.HttpServletResponse; +import java.util.Map; +import lombok.extern.slf4j.Slf4j; + +/** + * @author wangs + * @date 2022-05-30 + **/ +@RestController +@RequiredArgsConstructor +@Api(tags = "order管理") +@RequestMapping("/api/produceshiftorderdetail") +@Slf4j +public class ProduceshiftorderdetailController { + + private final ProduceshiftorderdetailService produceshiftorderdetailService; + + @GetMapping + @Log("查询order") + @ApiOperation("查询order") + //@PreAuthorize("@el.check('produceshiftorderdetail:list')") + public ResponseEntity query(@RequestParam Map whereJson, Pageable page){ + return new ResponseEntity<>(produceshiftorderdetailService.queryAll(whereJson,page),HttpStatus.OK); + } + + @PostMapping + @Log("新增order") + @ApiOperation("新增order") + //@PreAuthorize("@el.check('produceshiftorderdetail:add')") + public ResponseEntity create(@Validated @RequestBody ProduceshiftorderdetailDto dto){ + produceshiftorderdetailService.create(dto); + return new ResponseEntity<>(HttpStatus.CREATED); + } + + @PutMapping + @Log("修改order") + @ApiOperation("修改order") + //@PreAuthorize("@el.check('produceshiftorderdetail:edit')") + public ResponseEntity update(@Validated @RequestBody ProduceshiftorderdetailDto dto){ + produceshiftorderdetailService.update(dto); + return new ResponseEntity<>(HttpStatus.NO_CONTENT); + } + + @Log("删除order") + @ApiOperation("删除order") + //@PreAuthorize("@el.check('produceshiftorderdetail:del')") + @DeleteMapping + public ResponseEntity delete(@RequestBody String[] ids) { + produceshiftorderdetailService.deleteAll(ids); + return new ResponseEntity<>(HttpStatus.OK); + } + + @Log("导出order") + @ApiOperation("导出order") + @GetMapping(value = "/download") + //@PreAuthorize("@el.check('produceshiftorderdetail:list')") + public void download(HttpServletResponse response, @RequestParam Map whereJson) throws IOException { + produceshiftorderdetailService.download(produceshiftorderdetailService.queryAll(whereJson), response); + } +} diff --git a/nladmin-system/src/main/java/org/nl/acs/order/service/ProduceshiftorderService.java b/nladmin-system/src/main/java/org/nl/acs/order/service/ProduceshiftorderService.java index d50a992..01789f9 100644 --- a/nladmin-system/src/main/java/org/nl/acs/order/service/ProduceshiftorderService.java +++ b/nladmin-system/src/main/java/org/nl/acs/order/service/ProduceshiftorderService.java @@ -62,13 +62,6 @@ public interface ProduceshiftorderService { */ List queryAllOrder(String whereJson); - /** - * 查询所有未完成工单明细 - * - * @param whereJson 条件参数 - * @return List - */ - List queryAllOrderDteail(String whereJson); /** @@ -102,6 +95,7 @@ public interface ProduceshiftorderService { */ void update(ProduceshiftorderDto dto); + /** * 多选删除 * @@ -188,12 +182,11 @@ public interface ProduceshiftorderService { ProduceshiftorderDto findOrderByOrderIdFromCache(String order_code); - List findOrderDetailByOrderIdFromCache(String order_id); - List findOrderDetailByOrderCodeFromCache(String order_code); ProduceshiftorderDto apply_order(); + List findOrderByOrderStatusFromCache(String order_status); } diff --git a/nladmin-system/src/main/java/org/nl/acs/order/service/ProduceshiftorderdetailService.java b/nladmin-system/src/main/java/org/nl/acs/order/service/ProduceshiftorderdetailService.java new file mode 100644 index 0000000..8d94490 --- /dev/null +++ b/nladmin-system/src/main/java/org/nl/acs/order/service/ProduceshiftorderdetailService.java @@ -0,0 +1,87 @@ +package org.nl.acs.order.service; + +import org.nl.acs.order.service.dto.ProduceshiftorderdetailDto; +import org.springframework.data.domain.Pageable; +import java.util.Map; +import java.util.List; +import java.io.IOException; +import javax.servlet.http.HttpServletResponse; + +/** + * @description 服务接口 + * @author wangs + * @date 2022-05-30 + **/ +public interface ProduceshiftorderdetailService { + + /** + * 查询数据分页 + * @param whereJson 条件 + * @param page 分页参数 + * @return Map + */ + Map queryAll(Map whereJson, Pageable page); + + /** + * 查询所有数据不分页 + * @param whereJson 条件参数 + * @return List + */ + List queryAll(Map whereJson); + + /** + * 根据ID查询 + * @param orderDetail_id ID + * @return Produceshiftorderdetail + */ + ProduceshiftorderdetailDto findById(String orderDetail_id); + + /** + * 根据编码查询 + * @param code code + * @return Produceshiftorderdetail + */ + ProduceshiftorderdetailDto findByCode(String code); + + + /** + * 创建 + * @param dto / + */ + void create(ProduceshiftorderdetailDto dto); + + /** + * 编辑 + * @param dto / + */ + void update(ProduceshiftorderdetailDto dto); + + /** + * 多选删除 + * @param ids / + */ + void deleteAll(String[] ids); + + /** + * 导出数据 + * @param dtos 待导出的数据 + * @param response / + * @throws IOException / + */ + void download(List dtos, HttpServletResponse response) throws IOException; + + List queryAllOrderDteail(String whereJson); + + ProduceshiftorderdetailDto findOrderDetailByOrderFromCache(String order,String orderdetail_status); + + ProduceshiftorderdetailDto apply_orderDetail(String order); + + List findOrderDetailByOrderIdFromCache(String order_id); + + List findOrderDetailByOrderCodeFromCache(String order_code); + + Boolean sendLetteringMess(String message) throws IOException; + + Boolean isLastOrderDetail(String order); + +} diff --git a/nladmin-system/src/main/java/org/nl/acs/order/service/dto/ProduceshiftorderdetailDto.java b/nladmin-system/src/main/java/org/nl/acs/order/service/dto/ProduceshiftorderdetailDto.java index b30170e..b8cfb6d 100644 --- a/nladmin-system/src/main/java/org/nl/acs/order/service/dto/ProduceshiftorderdetailDto.java +++ b/nladmin-system/src/main/java/org/nl/acs/order/service/dto/ProduceshiftorderdetailDto.java @@ -106,6 +106,10 @@ public class ProduceshiftorderdetailDto implements Serializable { private String length; /** 工单明细状态 */ + //00-就绪、01-分拣中 + //02-下发工单明细暂停 03-工单明细暂停 + //04-下发强制完成 05-强制完成 + //06-自动完成 private String order_detail_status; /** 上料数量 */ diff --git a/nladmin-system/src/main/java/org/nl/acs/order/service/impl/ProduceshiftorderServiceImpl.java b/nladmin-system/src/main/java/org/nl/acs/order/service/impl/ProduceshiftorderServiceImpl.java index 8d70481..25a3392 100644 --- a/nladmin-system/src/main/java/org/nl/acs/order/service/impl/ProduceshiftorderServiceImpl.java +++ b/nladmin-system/src/main/java/org/nl/acs/order/service/impl/ProduceshiftorderServiceImpl.java @@ -14,6 +14,7 @@ import lombok.extern.slf4j.Slf4j; import org.nl.acs.device_driver.hailiang.hailiang_feeding_trunk.HaiLiangFeedingTrunkDeviceDriver; import org.nl.acs.opc.DeviceAppService; import org.nl.acs.order.service.ProduceshiftorderService; +import org.nl.acs.order.service.ProduceshiftorderdetailService; import org.nl.acs.order.service.dto.ProduceshiftorderDto; import org.nl.acs.order.service.dto.ProduceshiftorderdetailDto; import org.nl.exception.BadRequestException; @@ -47,13 +48,14 @@ public class ProduceshiftorderServiceImpl implements ProduceshiftorderService, A List order = new ArrayList(); - List detail = new ArrayList(); private final MongoTemplate mongoTemplate; @Autowired DeviceAppService deviceAppService; + @Autowired + ProduceshiftorderdetailService produceshiftorderdetailService; @Override public void autoInitial() throws Exception { @@ -62,7 +64,6 @@ public class ProduceshiftorderServiceImpl implements ProduceshiftorderService, A public synchronized void reload() { this.order = this.queryAllOrder("(order_status !='04' or order_status !='05' ) and is_deleted =0"); - this.detail = this.queryAllOrderDteail(" (order_detail_status != '04' or order_detail_status != '05') and is_deleted =0"); } @Override @@ -175,13 +176,7 @@ public class ProduceshiftorderServiceImpl implements ProduceshiftorderService, A return list; } - @Override - public List queryAllOrderDteail(String whereJson) { - WQLObject wo = WQLObject.getWQLObject("acs_produceshiftorderdetail"); - JSONArray arr = wo.query(whereJson).getResultJSONArray(0); - List list = arr.toJavaList(ProduceshiftorderdetailDto.class); - return list; - } + @Override @@ -311,9 +306,6 @@ public class ProduceshiftorderServiceImpl implements ProduceshiftorderService, A if (StrUtil.equals(dto.getOrder_id(), "07") || StrUtil.equals(dto.getOrder_id(), "08")) { order.add(dto); } - - - } @Override @@ -569,40 +561,14 @@ public class ProduceshiftorderServiceImpl implements ProduceshiftorderService, A return null; } - @Override - public List findOrderDetailByOrderIdFromCache(String order_id) { - List list = null; - Iterator var3 = detail.iterator(); - while (var3.hasNext()) { - ProduceshiftorderdetailDto oneorderDetail = (ProduceshiftorderdetailDto) var3.next(); - if (StrUtil.equals(oneorderDetail.getOrder_id(), order_id)) { - list.add(oneorderDetail); - } - } - return list; - } - - @Override - public List findOrderDetailByOrderCodeFromCache(String order_code) { - List list = null; - Iterator var3 = detail.iterator(); - while (var3.hasNext()) { - ProduceshiftorderdetailDto oneorderDetail = (ProduceshiftorderdetailDto) var3.next(); - if (StrUtil.equals(oneorderDetail.getOrder_code(), order_code)) { - list.add(oneorderDetail); - } - } - return list; - } - @Override public ProduceshiftorderDto apply_order() { List list = this.findOrderByOrderStatusFromCache("01"); if(ObjectUtil.isEmpty(list)){ - throw new BadRequestException("未找到处于已下发状态的工单!"); + throw new BadRequestException("未找到处于已下发状态的工单!"); } if(list.size() !=1){ - throw new BadRequestException("已下发状态的工单数量不唯一，请校验!"); + throw new BadRequestException("已下发状态的工单数量不唯一，请校验!"); } ProduceshiftorderDto dto = list.get(0); return dto; @@ -610,8 +576,8 @@ public class ProduceshiftorderServiceImpl implements ProduceshiftorderService, A @Override public List findOrderByOrderStatusFromCache(String order_status) { - List list = null; - Iterator var3 = detail.iterator(); + List list = new ArrayList(); + Iterator var3 = order.iterator(); while (var3.hasNext()) { ProduceshiftorderDto oneorder = (ProduceshiftorderDto) var3.next(); if (StrUtil.equals(oneorder.getOrder_status(), order_status)) { @@ -622,6 +588,7 @@ public class ProduceshiftorderServiceImpl implements ProduceshiftorderService, A } + @Override public Map querySorting(Map whereJson, Pageable page) { WQLObject wo = WQLObject.getWQLObject("acs_produceshiftorder"); diff --git a/nladmin-system/src/main/java/org/nl/acs/order/service/impl/ProduceshiftorderdetailServiceImpl.java b/nladmin-system/src/main/java/org/nl/acs/order/service/impl/ProduceshiftorderdetailServiceImpl.java new file mode 100644 index 0000000..9d89141 --- /dev/null +++ b/nladmin-system/src/main/java/org/nl/acs/order/service/impl/ProduceshiftorderdetailServiceImpl.java @@ -0,0 +1,299 @@ +package org.nl.acs.order.service.impl; + + +import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.StrUtil; +import lombok.RequiredArgsConstructor; +import org.nl.acs.order.service.ProduceshiftorderService; +import org.nl.acs.order.service.ProduceshiftorderdetailService; +import org.nl.acs.order.service.dto.ProduceshiftorderdetailDto; +import org.nl.exception.BadRequestException; +import org.nl.start.auto.initial.ApplicationAutoInitial; +import org.nl.start.auto.run.LetteringSocketConnectionAutoRun; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import org.springframework.data.domain.Pageable; + +import java.util.*; +import java.io.IOException; +import javax.servlet.http.HttpServletResponse; + +import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.IdUtil; +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; +import org.nl.utils.SecurityUtils; +import org.nl.wql.core.bean.ResultBean; +import org.nl.wql.core.bean.WQLObject; +import org.nl.wql.util.WqlUtil; +import org.nl.utils.FileUtil; +import lombok.extern.slf4j.Slf4j; + +/** + * @description 服务实现 + * @author wangs + * @date 2022-05-30 + **/ +@Service +@RequiredArgsConstructor +@Slf4j +public class ProduceshiftorderdetailServiceImpl implements ProduceshiftorderdetailService, ApplicationAutoInitial { + + List detail = new ArrayList(); + + @Autowired + ProduceshiftorderService produceshiftorderService; + + @Override + public Map queryAll(Map whereJson, Pageable page){ + WQLObject wo = WQLObject.getWQLObject("acs_produceshiftorderdetail"); + ResultBean rb = wo.pagequery(WqlUtil.getHttpContext(page), "", "update_time desc"); + final JSONObject json = rb.pageResult(); + return json; + } + + @Override + public List queryAll(Map whereJson){ + WQLObject wo = WQLObject.getWQLObject("acs_produceshiftorderdetail"); + JSONArray arr = wo.query().getResultJSONArray(0); + List list = arr.toJavaList(ProduceshiftorderdetailDto.class); + + return list; + } + + @Override + public ProduceshiftorderdetailDto findById(String orderDetail_id) { + WQLObject wo = WQLObject.getWQLObject("acs_produceshiftorderdetail"); + JSONObject json = wo.query("order_detail_id ='" + orderDetail_id + "'").uniqueResult(0); + final ProduceshiftorderdetailDto obj = (ProduceshiftorderdetailDto) JSONObject.toJavaObject(json, ProduceshiftorderdetailDto.class); + return obj; + } + + @Override + public ProduceshiftorderdetailDto findByCode(String code) { + WQLObject wo = WQLObject.getWQLObject("acs_produceshiftorderdetail"); + JSONObject json = wo.query("code ='" + code + "'").uniqueResult(0); + final ProduceshiftorderdetailDto obj = (ProduceshiftorderdetailDto) JSONObject.toJavaObject(json, ProduceshiftorderdetailDto.class); + return obj; + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void create(ProduceshiftorderdetailDto dto) { + String currentUsername = SecurityUtils.getCurrentUsername(); + String now = DateUtil.now(); + + dto.setOrder_detail_id(IdUtil.simpleUUID()); + dto.setCreate_by(currentUsername); + dto.setUpdate_by(currentUsername); + dto.setUpdate_time(now); + dto.setCreate_time(now); + + WQLObject wo = WQLObject.getWQLObject("acs_produceshiftorderdetail"); + JSONObject json = (JSONObject) JSONObject.toJSON(dto); + + wo.insert(json); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void update(ProduceshiftorderdetailDto dto) { + ProduceshiftorderdetailDto entity = this.findById(dto.getOrder_detail_id()); + if (entity == null) throw new BadRequestException("被删除或无权限，操作失败!"); + + String currentUsername = SecurityUtils.getCurrentUsername(); + String now = DateUtil.now(); + dto.setUpdate_time(now); + dto.setUpdate_by(currentUsername); + + WQLObject wo = WQLObject.getWQLObject("acs_produceshiftorderdetail"); + JSONObject json = (JSONObject) JSONObject.toJSON(dto); + + wo.update(json); + + + Iterator iterator = detail.iterator(); + while (iterator.hasNext()) { + ProduceshiftorderdetailDto produceshiftorderdetailDto = iterator.next(); + if (produceshiftorderdetailDto.getOrder_detail_id().equals(dto.getOrder_detail_id())) { + iterator.remove(); + } + } + if (StrUtil.equals(dto.getOrder_detail_status(), "07") || StrUtil.equals(dto.getOrder_detail_status(), "08")) { + detail.add(dto); + } + + + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void deleteAll(String[] ids) { + WQLObject wo = WQLObject.getWQLObject("acs_produceshiftorderdetail"); + for (String orderDetail_id: ids) { + wo.delete("orderDetail_id = '" + orderDetail_id + "'"); + } + } + + @Override + public void download(List all, HttpServletResponse response) throws IOException { + List> list = new ArrayList<>(); + for (ProduceshiftorderdetailDto produceshiftorderdetail : all) { + Map map = new LinkedHashMap<>(); + map.put("工单明细编码", produceshiftorderdetail.getOrder_detail_code()); + map.put("工单明细类型", produceshiftorderdetail.getOrder_detail_type()); + map.put("优先级", produceshiftorderdetail.getPriority()); + map.put("顺序号", produceshiftorderdetail.getSequence_number()); + map.put("工单标识", produceshiftorderdetail.getOrder_id()); + map.put("工单编码", produceshiftorderdetail.getOrder_code()); + map.put("工单数量", produceshiftorderdetail.getOrder_qty()); + map.put("捆扎包数", produceshiftorderdetail.getStrap_pack_number()); + map.put("当前捆扎包数", produceshiftorderdetail.getPresent_strap_pack_number()); + map.put("每捆数量", produceshiftorderdetail.getStrap_number()); + map.put("捆扎尾料数量", produceshiftorderdetail.getStrap_tailint_number()); + map.put("刻字信息", produceshiftorderdetail.getLettering_message()); + map.put("当前刻字数量", produceshiftorderdetail.getPresent_lettering_numer()); + map.put("贴标信息", produceshiftorderdetail.getLabeling_message()); + map.put("当前贴标数量", produceshiftorderdetail.getPresent_labeling_number()); + map.put("创建者", produceshiftorderdetail.getCreate_by()); + map.put("创建时间", produceshiftorderdetail.getCreate_time()); + map.put("修改者", produceshiftorderdetail.getUpdate_by()); + map.put("修改时间", produceshiftorderdetail.getUpdate_time()); + map.put("是否删除", produceshiftorderdetail.getIs_deleted()); + map.put("客户信息", produceshiftorderdetail.getCust_name()); + map.put("客户标识", produceshiftorderdetail.getCust_id()); + map.put("客户编码", produceshiftorderdetail.getCust_code()); + map.put("物料标识", produceshiftorderdetail.getMaterial_id()); + map.put("物料编码", produceshiftorderdetail.getMaterial_code()); + map.put("物料名称 ", produceshiftorderdetail.getMaterial_name()); + map.put("外径", produceshiftorderdetail.getOuter_diameter()); + map.put("壁厚", produceshiftorderdetail.getWall_thickness()); + map.put("物料长度", produceshiftorderdetail.getLength()); + map.put("工单明细状态", produceshiftorderdetail.getOrder_detail_status()); + map.put("上料数量", produceshiftorderdetail.getFeeding_qty()); + map.put("上料合格数量", produceshiftorderdetail.getLettering_qualified_qty()); + map.put("上料开始时间", produceshiftorderdetail.getFeeding_start_time()); + map.put("上料完成时间", produceshiftorderdetail.getFeeding_end_time()); + map.put("刻字合格数量", produceshiftorderdetail.getQualified_lettering_numer()); + map.put("刻字开始时间", produceshiftorderdetail.getLettering_start_time()); + map.put("刻字完成时间", produceshiftorderdetail.getLettering_finish_time()); + map.put("当前套冒数量", produceshiftorderdetail.getPresent_sleeveing_numer()); + map.put("套冒合格数量", produceshiftorderdetail.getQualified_sleeveing_number()); + map.put("套冒开始时间", produceshiftorderdetail.getSleeveing_start_time()); + map.put("套冒完成时间", produceshiftorderdetail.getSleeveing_finish_time()); + map.put("捆扎开始时间", produceshiftorderdetail.getStarp_start_time()); + map.put("捆扎完成时间", produceshiftorderdetail.getStarp_finish_time()); + map.put("裹膜数量", produceshiftorderdetail.getWraping_number()); + map.put("当前裹膜数量", produceshiftorderdetail.getPresent_wraping_number()); + map.put("裹膜合格数量", produceshiftorderdetail.getQualified_wraping_number()); + map.put("裹膜开始时间", produceshiftorderdetail.getWraping_start_time()); + map.put("裹膜完成时间", produceshiftorderdetail.getWraping_finish_time()); + map.put("贴标开始时间", produceshiftorderdetail.getLabeling_start_time()); + map.put("贴标完成时间", produceshiftorderdetail.getLabeling_finish_time()); + map.put("开始时间", produceshiftorderdetail.getStart_time()); + map.put("结束时间", produceshiftorderdetail.getEnd_time()); + list.add(map); + } + FileUtil.downloadExcel(list, response); + } + + @Override + public void autoInitial() throws Exception { + this.reload(); + } + + public synchronized void reload() { + this.detail = this.queryAllOrderDteail(" (order_detail_status != '04' or order_detail_status != '05') and is_deleted =0"); + } + + @Override + public List queryAllOrderDteail(String whereJson) { + WQLObject wo = WQLObject.getWQLObject("acs_produceshiftorderdetail"); + JSONArray arr = wo.query(whereJson).getResultJSONArray(0); + List list = arr.toJavaList(ProduceshiftorderdetailDto.class); + return list; + } + + @Override + public List findOrderDetailByOrderIdFromCache(String order_id) { + List list = null; + Iterator var3 = detail.iterator(); + while (var3.hasNext()) { + ProduceshiftorderdetailDto oneorderDetail = (ProduceshiftorderdetailDto) var3.next(); + if (StrUtil.equals(oneorderDetail.getOrder_id(), order_id)) { + list.add(oneorderDetail); + } + } + return list; + } + + @Override + public List findOrderDetailByOrderCodeFromCache(String order_code) { + List list = null; + Iterator var3 = detail.iterator(); + while (var3.hasNext()) { + ProduceshiftorderdetailDto oneorderDetail = (ProduceshiftorderdetailDto) var3.next(); + if (StrUtil.equals(oneorderDetail.getOrder_code(), order_code)) { + list.add(oneorderDetail); + } + } + return list; + } + + @Override + public Boolean sendLetteringMess(String message) { + //清缓存 + try { + LetteringSocketConnectionAutoRun.write("BUFFERCLEAR" + "\r\n"); + String yh = "\""; + String strInst = "SETTEXT " + "S1" + " " + yh + message + yh + "\r\n"; //2个变量 + LetteringSocketConnectionAutoRun.write(strInst + "\r\n"); + + } catch (Exception e) { + return false; + } + return true; + } + + + @Override + public ProduceshiftorderdetailDto findOrderDetailByOrderFromCache(String order,String orderdetail_status) { + Iterator var3 = detail.iterator(); + while (var3.hasNext()) { + ProduceshiftorderdetailDto onedetail = (ProduceshiftorderdetailDto) var3.next(); + if (StrUtil.equals(onedetail.getOrder_code(), order) && StrUtil.equals(onedetail.getOrder_detail_status(), orderdetail_status) ) { + return onedetail; + } + } + return null; + } + + @Override + public ProduceshiftorderdetailDto apply_orderDetail(String order) { + ProduceshiftorderdetailDto order_detail = this.findOrderDetailByOrderFromCache(order,"00"); + if(ObjectUtil.isEmpty(order_detail)){ + throw new BadRequestException("未找到处于就绪状态的工单明细!"); + } + + return order_detail; + } + + @Override + public Boolean isLastOrderDetail(String order) { + List list = new ArrayList<>(); + Iterator var3 = detail.iterator(); + while (var3.hasNext()) { + ProduceshiftorderdetailDto onedetail = (ProduceshiftorderdetailDto) var3.next(); + if (StrUtil.equals(onedetail.getOrder_code(), order) && StrUtil.equals(onedetail.getOrder_detail_status(), "00") ) { + list.add(onedetail); + } + } + if(list.size() != 1){ + return false; + } else { + return true; + } + } +} diff --git a/nladmin-system/src/main/java/org/nl/acs/order/service/wql/order.xls b/nladmin-system/src/main/java/org/nl/acs/order/service/wql/order.xls index cf6cb49a61e8707003ecea8677f1659e2b963784..cc1c2fd128f807d5cb506d12e7f86589ec91f8c0 100644 GIT binary patch delta 7976 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 J>IPNC|1U(U-@E_- diff --git a/nladmin-system/src/main/java/org/nl/start/auto/run/LetteringSocketConnectionAutoRun.java b/nladmin-system/src/main/java/org/nl/start/auto/run/LetteringSocketConnectionAutoRun.java index 33943ab..2ad8649 100644 --- a/nladmin-system/src/main/java/org/nl/start/auto/run/LetteringSocketConnectionAutoRun.java +++ b/nladmin-system/src/main/java/org/nl/start/auto/run/LetteringSocketConnectionAutoRun.java @@ -5,7 +5,12 @@ import lombok.extern.slf4j.Slf4j; import org.nl.acs.config.AcsConfig; import org.nl.acs.config.server.AcsConfigService; import org.nl.acs.config.server.impl.AcsConfigServiceImpl; +import org.nl.acs.device_driver.hailiang.hailiang_feeding_trunk.HaiLiangFeedingTrunkDeviceDriver; +import org.nl.acs.opc.Device; +import org.nl.acs.opc.DeviceAppService; +import org.nl.exception.BadRequestException; import org.nl.utils.SpringContextHolder; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import java.io.DataInputStream; @@ -14,6 +19,7 @@ import java.io.IOException; import java.io.UnsupportedEncodingException; import java.net.Socket; import java.util.Date; +import java.util.List; @Slf4j @Component @@ -27,7 +33,8 @@ public class LetteringSocketConnectionAutoRun extends AbstractAutoRunnable { private int recordTimeOut = 10000; private Date recordTime; boolean bConnected = true; - + @Autowired + DeviceAppService deviceAppService; public LetteringSocketConnectionAutoRun() { this.recordTime = new Date((new Date()).getTime() - (long) this.recordTimeOut); } @@ -66,8 +73,16 @@ public class LetteringSocketConnectionAutoRun extends AbstractAutoRunnable { } System.out.println("收到请求参数：" + bs); //打印完成 - if (StrUtil.equals(bs.toString(), "MSG 3")) { - +// if (StrUtil.equals(bs.toString(), "MSG 3")) { +// +// } + if (StrUtil.equals(bs.toString(), "OK")) { + HaiLiangFeedingTrunkDeviceDriver haiLiangFeedingTrunkDeviceDriver; + List deviceAll = deviceAppService.findDeviceDriver(HaiLiangFeedingTrunkDeviceDriver.class); + if (deviceAll.get(0) instanceof HaiLiangFeedingTrunkDeviceDriver) { + haiLiangFeedingTrunkDeviceDriver = (HaiLiangFeedingTrunkDeviceDriver) deviceAll.get(0); + haiLiangFeedingTrunkDeviceDriver.setSend_letter_flag_back(true); + } } } }