From 0e51dfdbe2dbf91f9017120c698fd7c0e147f9c1 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 24 三月 2022 10:18:05 +0800
Subject: [PATCH] #杰克缝纫机立库 【生成/修改单据】
---
src/main/java/com/zy/asrs/controller/OrderController.java | 12 ++++--
src/main/webapp/static/js/order/order.js | 53 ++++++++++++++------------
src/main/java/com/zy/asrs/entity/param/InitOrderParam.java | 21 ++++++++++
3 files changed, 57 insertions(+), 29 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OrderController.java b/src/main/java/com/zy/asrs/controller/OrderController.java
index 29d3776..6dac0da 100644
--- a/src/main/java/com/zy/asrs/controller/OrderController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderController.java
@@ -1,5 +1,6 @@
package com.zy.asrs.controller;
+import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
@@ -11,6 +12,7 @@
import com.core.common.R;
import com.zy.asrs.entity.Order;
import com.zy.asrs.entity.OrderDetl;
+import com.zy.asrs.entity.param.InitOrderParam;
import com.zy.asrs.service.OrderDetlService;
import com.zy.asrs.service.OrderService;
import com.zy.common.web.BaseController;
@@ -44,16 +46,18 @@
return R.ok(orderService.selectPage(new Page<>(curr, limit), wrapper));
}
-
-
-
@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)));
}
-
+ @RequestMapping(value = "/order/init/auth")
+ @ManagerAuth
+ public R init(@RequestBody InitOrderParam param){
+ System.out.println(JSON.toJSONString(param));
+ return R.ok();
+ }
diff --git a/src/main/java/com/zy/asrs/entity/param/InitOrderParam.java b/src/main/java/com/zy/asrs/entity/param/InitOrderParam.java
new file mode 100644
index 0000000..5ef56e0
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/param/InitOrderParam.java
@@ -0,0 +1,21 @@
+package com.zy.asrs.entity.param;
+
+import com.zy.asrs.entity.OrderDetl;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * Created by vincent on 2022/3/24
+ */
+@Data
+public class InitOrderParam {
+
+ private Long docType;
+
+ private String orderNo;
+
+ private List<OrderDetl> orderDetlList;
+
+
+}
diff --git a/src/main/webapp/static/js/order/order.js b/src/main/webapp/static/js/order/order.js
index 0c59c77..ccfb577 100644
--- a/src/main/webapp/static/js/order/order.js
+++ b/src/main/webapp/static/js/order/order.js
@@ -152,45 +152,48 @@
}
// 琛ㄥ崟鎻愪氦浜嬩欢
form.on('submit(orderEditSubmit)', function (data) {
+ console.log(data);
+ return false;
// 缁勮鏁版嵁
if (xxDataList.length <= 0) {
layer.tips('璇锋坊鍔犲崟鎹槑缁�', '#matAddBtnComment', {tips: [1, '#ff4c4c']});
return false;
}
- let param = [];
let nList = admin.util.deepClone(xxDataList);
for (let xi = 0; xi < nList.length; xi++) {
- if (nList[xi].inQty > 0 && inQtys[xi] !== nList[xi].qty) {
- layer.msg("宸插叆搴撴棤娉曚慨鏀�", {icon: 2})
- return false;
- } else if (nList[xi].qty > 0) {
- param.push({
- billNo: data.field.billNo,
- billType: data.field.billType,
- matNo: nList[xi].matNo,
- matName: nList[xi].matName,
- color: nList[xi].color,
- size: nList[xi].size,
- specs: nList[xi].specs,
- memo: nList[xi].memo,
- unit: nList[xi].unit,
- qty: nList[xi].qty,
- inQty: nList[xi].inQty,
- })
- }else if (nList[xi].anfme === 0){
+ // if (nList[xi].inQty > 0 && inQtys[xi] !== nList[xi].anfme) {
+ // layer.msg("宸插叆搴撴棤娉曚慨鏀�", {icon: 2})
+ // return false;
+ // } else if (nList[xi].anfme > 0) {
+ // param.push({
+ // billNo: data.field.billNo,
+ // billType: data.field.billType,
+ // matNo: nList[xi].matNo,
+ // matName: nList[xi].matName,
+ // color: nList[xi].color,
+ // size: nList[xi].size,
+ // specs: nList[xi].specs,
+ // memo: nList[xi].memo,
+ // unit: nList[xi].unit,
+ // qty: nList[xi].qty,
+ // inQty: nList[xi].inQty,
+ // })
+ // } else if (nList[xi].anfme <= 0){
+ // layer.msg('鏄庣粏淇敼鏁伴噺涓嶅悎娉�', {icon: 2});
+ // return false;
+ // }
+ if (nList[xi].anfme <= 0){
layer.msg('鏄庣粏淇敼鏁伴噺涓嶅悎娉�', {icon: 2});
return false;
}
}
- if (param.length === 0) {
- layer.msg('鍗曟嵁鏄庣粏鏁伴噺涓嶅悎娉�', {icon: 2});
- return false;
- }
layer.load(2);
$.ajax({
- url: baseUrl+"/waitMatin/" + (isExpAdd?"add":"modify") + "/auth",
+ url: baseUrl+"/order/" + (isExpAdd?"add":"modify") + "/auth",
headers: {'token': localStorage.getItem('token')},
- data: JSON.stringify(param),
+ data: JSON.stringify({
+
+ }),
contentType:'application/json;charset=UTF-8',
method: 'POST',
success: function (res) {
--
Gitblit v1.9.1