zy-asrs-master.git

			@@ -125,6 +125,7 @@
			Order order = orderService.selectByNo(param.getOrderNo(), param.getHostId());
			// 如果单据不存在则添加；如果单据存在，作业中无法修改，反之则修改单据
			boolean boo = false;
			boolean b = false;
			if (!Cools.isEmpty(order)) {
			List<OrderDetl> orderDetls = orderDetlService.list(new LambdaQueryWrapper<OrderDetl>()
			.eq(OrderDetl::getOrderId, order.getId()).eq(OrderDetl::getHostId, param.getHostId()));
			@@ -132,14 +133,18 @@
			if (orderDetls.size() == param.getMats().size()) {
			for (OrderDetl o : orderDetls
			) {

			for (GenerateOrderMatParam matParam : param.getMats()
			) {
			if (o.getMatnr().equals(matParam.getMatnr()) && !o.getAnfme().equals(matParam.getAnfme())) {
			boo = true;
			break;
			}
			if (o.getMatnr().equals(matParam.getMatnr())) {
			b = true;
			}
			}
			if (boo) {
			if (boo \|\| !b) {
			break;
			}
			}
			@@ -147,7 +152,7 @@
			boo = true;
			}
			}
			if (boo) {
			if (boo \|\| (!b && !Cools.isEmpty(order))) {
			if (order.getSettle() > 1L) {
			throw new CoolException(param.getOrderNo() + "正在出库，无法修改单据");
			}
			@@ -226,7 +231,7 @@
			}
			}
			}
			if(!boo&&Cools.isEmpty(order)){
			if (!boo && Cools.isEmpty(order)) {
			DocType docType = docTypeService.getOne(new LambdaQueryWrapper<DocType>().eq(DocType::getDocId, param.getOrderType()));
			if (docType == null) {
			throw new CoolException("订单类型不存在");

			@@ -13,6 +13,7 @@
			import com.zy.asrs.common.utils.WaitPakingExcelListener;
			import com.zy.asrs.common.wms.entity.Mat;
			import com.zy.asrs.common.wms.entity.WaitPakin;
			import com.zy.asrs.common.wms.entity.WaitPakinLog;
			import com.zy.asrs.common.wms.entity.WrkMast;
			import com.zy.asrs.common.wms.service.OrderDetlService;
			import com.zy.asrs.common.wms.service.WaitPakinService;
			@@ -216,4 +217,30 @@
			return R.ok("成功同步"+listener.getTotal()+"条商品数据");
			}

			@RequestMapping(value = "/waitPakin/export/auth")
			@ManagerAuth(memo = "库位明细导出")
			public synchronized R export(@RequestBody JSONObject param){
			List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
			QueryWrapper<WaitPakin> wrapper = new QueryWrapper<>();
			Map<String, Object> map = excludeTrash(param.getJSONObject("waitPakin"));
			String row = "";
			if (map.get("row") != null) {
			String chooseRow = (String) map.get("row");
			if (chooseRow.length() == 1) {
			row = "0" + chooseRow;
			map.remove("row");
			}else {
			row = chooseRow;
			map.remove("row");
			}
			}
			convert(map, wrapper);
			// if (!row.equals("")){
			// wrapper.and()
			// .where("loc_no like '" +row +"%'");
			// }
			List<WaitPakin> list = waitPakinService.list(wrapper);
			return R.ok(exportSupport(list, fields));
			}

			}

	zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/service/impl/ApiServiceImpl.java	11 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WaitPakinController.java	27 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史