From 66172fb38c71b42931896b9a1a38b8b6ed9e57e4 Mon Sep 17 00:00:00 2001 From: ZY <zc857179121@qq.com> Date: 星期四, 26 九月 2024 16:14:17 +0800 Subject: [PATCH] 1 --- src/main/java/com/zy/asrs/controller/MobileController.java | 3 +++ src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 10 ++++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java index 37bf5a0..67aab93 100644 --- a/src/main/java/com/zy/asrs/controller/MobileController.java +++ b/src/main/java/com/zy/asrs/controller/MobileController.java @@ -17,6 +17,7 @@ import com.zy.common.model.WrkDto; import com.zy.common.web.BaseController; import com.zy.system.entity.User; +import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; @@ -31,6 +32,7 @@ */ @RestController @RequestMapping("mobile") +@Slf4j public class MobileController extends BaseController { @Autowired @@ -459,6 +461,7 @@ @ManagerAuth(memo = "pla鍏ュ簱") @Transactional public R plaPackInTestErp(@RequestBody JSONObject json) throws ParseException { + log.info("璇锋眰鍙傛暟锛歿}", json); String locNo = json.get("locNo").toString(); JSONArray jsonArray = JSONArray.parseArray(json.getJSONArray("pla").toJSONString()); //鍒ゆ柇姝ゆ鍏ュ簱鏄惁杈惧埌搴撳瓨涓婇檺 diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java index 7f15db0..2524d15 100644 --- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java @@ -573,7 +573,7 @@ JSONArray jsonArray = JSONArray.parseArray(json.getJSONArray("pla").toJSONString()); List<OpenOrderPakoutParam> list = new ArrayList<>(); - + String time = new Date().getTime() + ""; for (Object o : jsonArray) { JSONObject jsonObject = (JSONObject) o; String brand = jsonObject.get("brand").toString(); @@ -582,12 +582,15 @@ Pla pla = plaService.selectByBatchAndPackageNo(batch, packageNo, brand); Mat mat = matService.selectByMaktx(pla.getBrand()); + if (Cools.isEmpty(pla.getProOrderNo())) { + pla.setProOrderNo(time); + } //褰撶敓浜у崟鍙蜂笉涓�鑷存椂锛岄渶瑕佹柊寤轰竴涓猵aram - if (list.isEmpty() || (!Cools.isEmpty(pla.getProOrderNo()) && checkOrder(list, pla.getProOrderNo()) == null)) { + if (list.isEmpty() || checkOrder(list, pla.getProOrderNo()) == null) { OpenOrderPakoutParam param = new OpenOrderPakoutParam(); param.setcMaker(json.get("user").toString()); String type = Cools.isEmpty(pla.getProOrderNo()) ? "璋冩嫧鍏ュ簱鍗�" : "浜ф垚鍝佸叆搴�"; - param.setcCode(Cools.isEmpty(pla.getProOrderNo()) ? (new Date().getTime()) + "" : pla.getProOrderNo()); + param.setcCode(Cools.isEmpty(pla.getProOrderNo()) ? time : pla.getProOrderNo()); param.setcAccount(pla.getWorkshop()); param.setdDate(Utils.getDateStr(new Date())); param.setType(type); @@ -627,7 +630,6 @@ return 200; //return doHttpRequest(list, "鍏ュ簱鍗曚笂鎶�", url, orderReportPath, null, "127.0.0.1"); } - @Override -- Gitblit v1.9.1