From 319e3a08d77530ac40dcbdd2c3191490df630348 Mon Sep 17 00:00:00 2001
From: zhangchao <zc857179121@qq.com>
Date: 星期二, 12 十一月 2024 11:04:29 +0800
Subject: [PATCH] 添加出库单据
---
src/main/java/com/zy/asrs/controller/OrderController.java | 118 +++++++++++++++++++++++++++++++---------------------------
1 files changed, 63 insertions(+), 55 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OrderController.java b/src/main/java/com/zy/asrs/controller/OrderController.java
index bbcd4c8..39c3cbe 100644
--- a/src/main/java/com/zy/asrs/controller/OrderController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderController.java
@@ -55,7 +55,7 @@
@RequestMapping(value = "/order/nav/list/auth")
@ManagerAuth
- public R navList(@RequestParam(required = false) String orderNo){
+ public R navList(@RequestParam(required = false) String orderNo) {
EntityWrapper<Order> wrapper = new EntityWrapper<>();
if (!Cools.isEmpty(orderNo)) {
wrapper.like("order_no", orderNo);
@@ -83,11 +83,11 @@
@RequestMapping(value = "/order/head/page/auth")
@ManagerAuth
- public R head(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam(required = false)String orderByField,
- @RequestParam(required = false)String orderByType,
- @RequestParam Map<String, Object> param){
+ public R head(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam(required = false) String orderByField,
+ @RequestParam(required = false) String orderByType,
+ @RequestParam Map<String, Object> param) {
EntityWrapper<Order> wrapper = new EntityWrapper<>();
excludeTrash(param);
// 闄愬埗閿�鍞鑹插彧鑳界湅鑷繁鍒涘缓鐨勫崟瀛愶紙閿�鍞鑹瞚d鍥哄畾21锛屼笉鑳介殢鎰忎慨鏀癸級
@@ -99,14 +99,16 @@
Object userName = param.get("oper_memb");
if (userName != null && user.getRoleId() != 21) {
List<User> users = userService.selectList(new EntityWrapper<User>().like("username", (String) param.get("oper_memb")));
- if(users.size() > 0){
+ if (users.size() > 0) {
wrapper.in("create_by", users.stream().map(User::getId).collect(Collectors.toList()));
}
}
// 涓婅堪宸茶嚜瀹氫箟鎼滅储锛岀Щ闄ゆ搷浣滀汉濮撳悕鎼滅储
param.remove("oper_memb");
convert(param, wrapper);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));} else {
+ if (!Cools.isEmpty(orderByField)) {
+ wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
+ } else {
wrapper.orderBy("settle").orderBy("create_time", false);
}
wrapper.eq("status", 1);
@@ -115,13 +117,13 @@
@RequestMapping(value = "/order/detl/all/auth")
@ManagerAuth
- public R head(@RequestParam Long orderId){
+ public R head(@RequestParam Long orderId) {
List<OrderDetl> orderDetls = orderDetlService.selectList(new EntityWrapper<OrderDetl>().eq("order_id", orderId));
List<OrderDetl> orderDetls1 = new ArrayList<>();
- for (OrderDetl orderDetl : orderDetls){
+ 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){
+ if (v1 != 0.0) {
orderDetls1.add(orderDetl);
}
}
@@ -131,13 +133,13 @@
@RequestMapping(value = "/order/form/add/auth")
@ManagerAuth(memo = "鎵嬪姩娣诲姞璁㈠崟")
@Transactional
- public R formAdd(@RequestBody OrderDomainParam param){
+ public R formAdd(@RequestBody OrderDomainParam param) {
String prefix = "";
DocType docType = docTypeService.selectById(param.getDocType());
- if(!Cools.isEmpty(docType)){
+ if (!Cools.isEmpty(docType)) {
prefix = docType.getPakin() == 1 ? "RK" : "CK";
}
- if(Cools.isEmpty(param.getOrderNo())){
+ if (Cools.isEmpty(param.getOrderNo())) {
param.setOrderNo(prefix + snowflakeIdWorker.nextId());
}
Order order = orderService.selectByNo(param.getOrderNo());
@@ -149,12 +151,16 @@
return R.error("鍗曟嵁缂栧彿鍦ㄥ巻鍙叉。涓凡瀛樺湪");
}
Date now = new Date();
+ Long itemId = null;
+ if (param.getDocType() == 16 || param.getDocType() == 19) {
+ itemId = 1L;
+ }
order = new Order(
String.valueOf(snowflakeIdWorker.nextId()), // 缂栧彿[闈炵┖]
param.getOrderNo(), // 璁㈠崟缂栧彿
DateUtils.convert(now), // 鍗曟嵁鏃ユ湡
param.getDocType(), // 鍗曟嵁绫诲瀷
- null, // 椤圭洰缂栧彿
+ itemId, // 椤圭洰缂栧彿
param.getItemName(), //
null, // 璋冩嫧椤圭洰缂栧彿
null, // 鍒濆绁ㄦ嵁鍙�
@@ -223,7 +229,7 @@
@RequestMapping(value = "/order/form/modify/auth")
@ManagerAuth(memo = "鎵嬪姩淇敼璁㈠崟")
@Transactional
- public R formModify(@RequestBody OrderDomainParam param){
+ public R formModify(@RequestBody OrderDomainParam param) {
Order order = orderService.selectById(param.getOrderId());
if (order == null || order.getStatus() == 0) {
return R.error("璁㈠崟涓嶅瓨鍦�");
@@ -231,7 +237,7 @@
Date now = new Date();
Long userId = getUserId();
// 淇敼涓绘。
- if (!param.getDocType().equals(order.getDocType()) || param.getCstmrName() != order.getCstmrName() || !Cools.eq(param.getItemName(),order.getItemName())) {
+ if (!param.getDocType().equals(order.getDocType()) || param.getCstmrName() != order.getCstmrName() || !Cools.eq(param.getItemName(), order.getItemName())) {
order.setDocType(param.getDocType());
order.setUpdateBy(userId);
order.setCstmr(param.getCstmr());
@@ -289,22 +295,24 @@
@RequestMapping(value = "/order/list/auth")
@ManagerAuth
- public R list(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam(required = false)String orderByField,
- @RequestParam(required = false)String orderByType,
- @RequestParam Map<String, Object> param){
+ public R list(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam(required = false) String orderByField,
+ @RequestParam(required = false) String orderByType,
+ @RequestParam Map<String, Object> param) {
EntityWrapper<Order> wrapper = new EntityWrapper<>();
excludeTrash(param);
convert(param, wrapper);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ if (!Cools.isEmpty(orderByField)) {
+ wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
+ }
return R.ok(orderService.selectPage(new Page<>(curr, limit), wrapper));
}
- private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
- for (Map.Entry<String, Object> entry : map.entrySet()){
+ private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper) {
+ for (Map.Entry<String, Object> entry : map.entrySet()) {
String val = String.valueOf(entry.getValue());
- if (val.contains(RANGE_TIME_LINK)){
+ if (val.contains(RANGE_TIME_LINK)) {
String[] dates = val.split(RANGE_TIME_LINK);
wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
@@ -316,15 +324,15 @@
@RequestMapping(value = "/order/update/auth")
@ManagerAuth
- public R update(Order order){
- if (Cools.isEmpty(order) || null == order.getId()){
+ public R update(Order order) {
+ 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 (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("瀛樺湪浣滀笟涓暟鎹紝涓嶈兘瀹岀粨銆傝妫�鏌ュ叆搴撻�氱煡妗ｅ拰宸ヤ綔妗�");
}
@@ -341,7 +349,7 @@
@RequestMapping(value = "/order/delete/auth")
@ManagerAuth(memo = "鎵嬪姩鍒犻櫎璁㈠崟")
@Transactional
- public R delete(@RequestParam Long orderId){
+ public R delete(@RequestParam Long orderId) {
orderService.remove(orderId);
// Order order = orderService.selectById(orderId);
// if (order != null) {
@@ -356,7 +364,7 @@
@RequestMapping(value = "/order/export/auth")
@ManagerAuth
- public R export(@RequestBody JSONObject param){
+ public R export(@RequestBody JSONObject param) {
EntityWrapper<Order> wrapper = new EntityWrapper<>();
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
Map<String, Object> map = excludeTrash(param.getJSONObject("order"));
@@ -370,18 +378,18 @@
public R query(String condition) {
EntityWrapper<Order> wrapper = new EntityWrapper<>();
wrapper.like("order_no", condition);
- wrapper.le("settle",3);
+ wrapper.le("settle", 3);
Page<Order> page = orderService.selectPage(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
- for (Order order : page.getRecords()){
+ for (Order order : page.getRecords()) {
Map<String, Object> map = new HashMap<>();
map.put("id", order.getId());
map.put("value", order.getOrderNo());
- map.put("customer",order.getCstmrName());
- map.put("phone",order.getTel());
- map.put("addr",order.getNumber());
- map.put("allocate",order.getItemName());
- map.put("type","order");
+ map.put("customer", order.getCstmrName());
+ map.put("phone", order.getTel());
+ map.put("addr", order.getNumber());
+ map.put("allocate", order.getItemName());
+ map.put("type", "order");
result.add(map);
}
return R.ok(result);
@@ -391,26 +399,27 @@
@ManagerAuth
public R query(@RequestBody JSONObject param) {
Wrapper<Order> wrapper = new EntityWrapper<Order>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
- if (null != orderService.selectOne(wrapper)){
+ if (null != orderService.selectOne(wrapper)) {
return R.parse(BaseRes.REPEAT).add(getComment(Order.class, String.valueOf(param.get("key"))));
}
return R.ok();
}
+
@RequestMapping(value = "/order/print/auth")
@ManagerAuth(memo = "璁㈠崟缂栫爜鎵撳嵃")
public R orderPrint(@RequestParam(value = "param[]") String[] param) {
- if(Cools.isEmpty(param)) {
+ if (Cools.isEmpty(param)) {
return R.parse(CodeRes.EMPTY);
}
List<OrderDetl> res = new ArrayList<>();
- for (String orderNo : param){
+ 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){
+ public R in(@RequestBody JSONObject param) {
System.out.println("111 = " + 111);
return R.ok();
}
@@ -420,11 +429,11 @@
public void export(HttpServletResponse response, @RequestParam String orderNo) throws IOException {
//浠庢暟鎹簱鏌ヨ鏁版嵁
EntityWrapper<OrderDetl> locCheckEntityWrapper = new EntityWrapper<>();
- locCheckEntityWrapper.eq("order_no",orderNo);
+ 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> orderDetlVos = new ArrayList<>();
+ OrderDetlVo orderDetlVo = new OrderDetlVo();
+ for (OrderDetl o :
list) {
orderDetlVo.setOrderNo(o.getOrderNo());
orderDetlVo.setMatnr(o.getMatnr());
@@ -441,7 +450,7 @@
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");
+ response.setHeader("Content-disposition", "attachment;filename=" + fileName + orderNo + ".xlsx");
Set<String> includeColumnFiledNames = new HashSet<String>();
includeColumnFiledNames.add("orderNo");
includeColumnFiledNames.add("matnr");
@@ -470,17 +479,16 @@
@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);
+ 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