9 changed files with 552 additions and 60 deletions
@ -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<Object> 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<Object> 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<Object> 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<Object> 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); |
|||
} |
|||
} |
|||
@ -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<String,Object> |
|||
*/ |
|||
Map<String,Object> queryAll(Map whereJson, Pageable page); |
|||
|
|||
/** |
|||
* 查询所有数据不分页 |
|||
* @param whereJson 条件参数 |
|||
* @return List<ProduceshiftorderdetailDto> |
|||
*/ |
|||
List<ProduceshiftorderdetailDto> 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<ProduceshiftorderdetailDto> dtos, HttpServletResponse response) throws IOException; |
|||
|
|||
List<ProduceshiftorderdetailDto> queryAllOrderDteail(String whereJson); |
|||
|
|||
ProduceshiftorderdetailDto findOrderDetailByOrderFromCache(String order,String orderdetail_status); |
|||
|
|||
ProduceshiftorderdetailDto apply_orderDetail(String order); |
|||
|
|||
List<ProduceshiftorderdetailDto> findOrderDetailByOrderIdFromCache(String order_id); |
|||
|
|||
List<ProduceshiftorderdetailDto> findOrderDetailByOrderCodeFromCache(String order_code); |
|||
|
|||
Boolean sendLetteringMess(String message) throws IOException; |
|||
|
|||
Boolean isLastOrderDetail(String order); |
|||
|
|||
} |
|||
@ -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<ProduceshiftorderdetailDto> detail = new ArrayList(); |
|||
|
|||
@Autowired |
|||
ProduceshiftorderService produceshiftorderService; |
|||
|
|||
@Override |
|||
public Map<String,Object> 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<ProduceshiftorderdetailDto> queryAll(Map whereJson){ |
|||
WQLObject wo = WQLObject.getWQLObject("acs_produceshiftorderdetail"); |
|||
JSONArray arr = wo.query().getResultJSONArray(0); |
|||
List<ProduceshiftorderdetailDto> 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<ProduceshiftorderdetailDto> 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<ProduceshiftorderdetailDto> all, HttpServletResponse response) throws IOException { |
|||
List<Map<String, Object>> list = new ArrayList<>(); |
|||
for (ProduceshiftorderdetailDto produceshiftorderdetail : all) { |
|||
Map<String,Object> 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<ProduceshiftorderdetailDto> queryAllOrderDteail(String whereJson) { |
|||
WQLObject wo = WQLObject.getWQLObject("acs_produceshiftorderdetail"); |
|||
JSONArray arr = wo.query(whereJson).getResultJSONArray(0); |
|||
List<ProduceshiftorderdetailDto> list = arr.toJavaList(ProduceshiftorderdetailDto.class); |
|||
return list; |
|||
} |
|||
|
|||
@Override |
|||
public List<ProduceshiftorderdetailDto> findOrderDetailByOrderIdFromCache(String order_id) { |
|||
List<ProduceshiftorderdetailDto> 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<ProduceshiftorderdetailDto> findOrderDetailByOrderCodeFromCache(String order_code) { |
|||
List<ProduceshiftorderdetailDto> 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<ProduceshiftorderdetailDto> 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; |
|||
} |
|||
} |
|||
} |
|||
Binary file not shown.
Loading…
Reference in new issue