From 0b4036950ca61835a29ed0a13379a68af652fa59 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期二, 26 十二月 2023 10:30:48 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/OrderController.java | 152 ++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 140 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OrderController.java b/src/main/java/com/zy/asrs/controller/OrderController.java
index 26ecbbe..e1ec863 100644
--- a/src/main/java/com/zy/asrs/controller/OrderController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderController.java
@@ -1,5 +1,7 @@
package com.zy.asrs.controller;
+import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.write.style.column.LongestMatchColumnWidthStyleStrategy;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
@@ -7,19 +9,22 @@
import com.core.annotations.ManagerAuth;
import com.core.common.*;
import com.core.exception.CoolException;
-import com.zy.asrs.entity.DocType;
-import com.zy.asrs.entity.Order;
-import com.zy.asrs.entity.OrderDetl;
+import com.sun.org.apache.xpath.internal.operations.Or;
+import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.OrderDomainParam;
-import com.zy.asrs.service.DocTypeService;
-import com.zy.asrs.service.OrderDetlService;
-import com.zy.asrs.service.OrderService;
+import com.zy.asrs.entity.result.OrderDetlVo;
+import com.zy.asrs.service.*;
+import com.zy.common.CodeRes;
import com.zy.common.model.DetlDto;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.math.BigDecimal;
+import java.net.URLEncoder;
import java.util.*;
@RestController
@@ -33,6 +38,14 @@
private SnowflakeIdWorker snowflakeIdWorker;
@Autowired
private DocTypeService docTypeService;
+ @Autowired
+ private WrkDetlService wrkDetlService;
+ @Autowired
+ private WaitPakinService waitPakinService;
+ @Autowired
+ private LocOwnerService locOwnerService;
+ @Autowired
+ private OrderLogService orderLogService;
@RequestMapping(value = "/order/nav/list/auth")
@ManagerAuth
@@ -82,19 +95,37 @@
@RequestMapping(value = "/order/detl/all/auth")
@ManagerAuth
public R head(@RequestParam Long orderId){
- return R.ok().add(orderDetlService.selectList(new EntityWrapper<OrderDetl>().eq("order_id", orderId)));
+ List<OrderDetl> orderDetls = orderDetlService.selectList(new EntityWrapper<OrderDetl>().eq("order_id", orderId));
+ List<OrderDetl> orderDetls1 = new ArrayList<>();
+ for (OrderDetl orderDetl : orderDetls){
+ double v = orderDetl.getAnfme() - orderDetl.getWorkQty();
+ double v1 = new BigDecimal(v).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue();
+ if (v1!=0.0){
+ orderDetls1.add(orderDetl);
+ }
+ }
+ return R.ok().add(orderDetls1);
}
@RequestMapping(value = "/order/form/add/auth")
@ManagerAuth(memo = "鎵嬪姩娣诲姞璁㈠崟")
@Transactional
public R formAdd(@RequestBody OrderDomainParam param){
+ String prefix = "";
+ DocType docType = docTypeService.selectById(param.getDocType());
+ if(!Cools.isEmpty(docType)){
+ prefix = docType.getPakin() == 1 ? "RK" : "CK";
+ }
if(Cools.isEmpty(param.getOrderNo())){
- param.setOrderNo("HAND" + snowflakeIdWorker.nextId());
+ param.setOrderNo(prefix + snowflakeIdWorker.nextId());
}
Order order = orderService.selectByNo(param.getOrderNo());
+ OrderLog orderLog = orderLogService.selectByNo(param.getOrderNo());
if (order != null) {
return R.error("鍗曟嵁缂栧彿宸插瓨鍦�");
+ }
+ if (orderLog != null) {
+ return R.error("鍗曟嵁缂栧彿鍦ㄥ巻鍙叉。涓凡瀛樺湪");
}
Date now = new Date();
order = new Order(
@@ -138,6 +169,10 @@
}
List<DetlDto> list = new ArrayList<>();
for (OrderDetl orderDetl : param.getOrderDetlList()) {
+
+ if (orderDetl.getBatch() == null) {
+ orderDetl.setBatch("");
+ }
DetlDto dto = new DetlDto(orderDetl.getMatnr(), orderDetl.getBatch());
if (DetlDto.has(list, dto)) {
OrderDetl item = orderDetlService.selectItem(order.getId(), orderDetl.getMatnr(), orderDetl.getBatch());
@@ -155,6 +190,7 @@
orderDetl.setUpdateTime(now);
orderDetl.setStatus(1);
orderDetl.setQty(0.0D);
+ orderDetl.setUuid(String.valueOf(System.currentTimeMillis()));
if (!orderDetlService.insert(orderDetl)) {
throw new CoolException("淇濆瓨璁㈠崟鏄庣粏妗ｅけ璐�");
}
@@ -217,10 +253,6 @@
}
-
-
-
-
// ------------------------------------------------------------------------------------------------
@RequestMapping(value = "/order/{id}/auth")
@@ -262,6 +294,16 @@
if (Cools.isEmpty(order) || null == order.getId()){
return R.error();
}
+
+ //璁㈠崟瀹岀粨鍓嶏紝鍒ゆ柇鏄惁瀛樺湪浣滀笟涓暟鎹紝瀛樺湪鍒欎笉鑳藉畬缁�
+ if(order.getSettle() == 4){
+ int wrkCount = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("order_no",order.getOrderNo()));
+ int pakinCount = waitPakinService.selectCount(new EntityWrapper<WaitPakin>().eq("order_no",order.getOrderNo()));
+ if (wrkCount > 0 || pakinCount > 0) {
+ throw new CoolException("瀛樺湪浣滀笟涓暟鎹紝涓嶈兘瀹岀粨銆傝妫�鏌ュ叆搴撻�氱煡妗ｅ拰宸ヤ綔妗�");
+ }
+ }
+
order.setUpdateBy(getUserId());
order.setUpdateTime(new Date());
if (!orderService.updateById(order)) {
@@ -322,5 +364,91 @@
}
return R.ok();
}
+ @RequestMapping(value = "/order/print/auth")
+ @ManagerAuth(memo = "璁㈠崟缂栫爜鎵撳嵃")
+ public R orderPrint(@RequestParam(value = "param[]") String[] param) {
+ if(Cools.isEmpty(param)) {
+ return R.parse(CodeRes.EMPTY);
+ }
+ List<OrderDetl> res = new ArrayList<>();
+ for (String orderNo : param){
+ res = orderDetlService.selectList(new EntityWrapper<OrderDetl>().eq("order_no", orderNo));
+ }
+ return R.ok().add(res);
+ }
+
+ @RequestMapping("/order/in")
+ public R in(@RequestBody JSONObject param){
+ System.out.println("111 = " + 111);
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/order/printExport/auth")
+ // @ManagerAuth(memo = "鐩樼偣鍗曞鍑�")
+ public void export(HttpServletResponse response, @RequestParam String orderNo) throws IOException {
+ //浠庢暟鎹簱鏌ヨ鏁版嵁
+ EntityWrapper<OrderDetl> locCheckEntityWrapper = new EntityWrapper<>();
+ locCheckEntityWrapper.eq("order_no",orderNo);
+ List<OrderDetl> list = orderDetlService.selectList(locCheckEntityWrapper);
+ List<OrderDetlVo> orderDetlVos=new ArrayList<>();
+ OrderDetlVo orderDetlVo=new OrderDetlVo();
+ for (OrderDetl o:
+ list) {
+ orderDetlVo.setOrderNo(o.getOrderNo());
+ orderDetlVo.setMatnr(o.getMatnr());
+ orderDetlVo.setMaktx(o.getMaktx());
+ orderDetlVo.setSpecs(o.getSpecs());
+ orderDetlVo.setOwner(o.getOwner$());
+ orderDetlVo.setPayment(o.getPayment$());
+ orderDetlVo.setAnfme(o.getAnfme());
+ orderDetlVo.setQty(o.getQty());
+ orderDetlVo.setWorkQty(o.getWorkQty());
+ orderDetlVo.setWeight(o.getWeight());
+ orderDetlVos.add(orderDetlVo);
+ }
+ response.setContentType("application/vnd.ms-excel");
+ response.setCharacterEncoding("utf-8");
+ String fileName = URLEncoder.encode("鍗曟嵁", "UTF-8");
+ response.setHeader("Content-disposition", "attachment;filename=" + fileName+ orderNo + ".xlsx");
+ Set<String> includeColumnFiledNames = new HashSet<String>();
+ includeColumnFiledNames.add("orderNo");
+ includeColumnFiledNames.add("matnr");
+ includeColumnFiledNames.add("maktx");
+ includeColumnFiledNames.add("specs");
+ includeColumnFiledNames.add("owner");
+ includeColumnFiledNames.add("payment");
+ includeColumnFiledNames.add("anfme");
+ includeColumnFiledNames.add("qty");
+ includeColumnFiledNames.add("workQty");
+ includeColumnFiledNames.add("weight");
+ EasyExcel.write(response.getOutputStream(), OrderDetlVo.class)
+ .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy())
+ .includeColumnFiledNames(includeColumnFiledNames)
+ .sheet("琛�1")
+ .doWrite(orderDetlVos);
+ }
+
+ @RequestMapping(value = "/order/list/all")
+ public R orderList() {
+
+ return R.ok(orderService.selectAllorderNo());
+ }
+
+ //璁㈠崟缁勬墭2
+ @RequestMapping(value = "/order/list/orderNo")
+ public R orderListorderNo(@RequestParam String orderNo) {
+ //鏁伴噺淇敼鎴愪负瀹屾垚鏁伴噺
+ List<OrderDetl> orderDetl1=orderDetlService.selectList(new EntityWrapper<OrderDetl>().eq("order_no",orderNo));
+ List<OrderDetl> orderDetls= new ArrayList<OrderDetl>();
+ for (OrderDetl o: orderDetl1) {
+ o.setAnfme(o.getAnfme()-o.getWorkQty());
+ BigDecimal c1 = new BigDecimal(o.getAnfme()).setScale(2,BigDecimal.ROUND_HALF_UP);
+ o.setAnfme(c1.doubleValue());
+ orderDetls.add(o);
+ }
+ return R.ok(orderDetls);
+ }
+
+
}
--
Gitblit v1.9.1