zy-asrs.git - Gitblit

			@@ -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();
			}

			@@ -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) {

	src/main/java/com/zy/asrs/controller/OrderController.java	12 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/java/com/zy/asrs/entity/param/InitOrderParam.java	21 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/webapp/static/js/order/order.js	53 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

New file
			@@ -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;


			}