From 82de5a307466894bbb0258f8a63a26a7bb96d80d Mon Sep 17 00:00:00 2001 From: zhang <zc857179121@qq.com> Date: 星期四, 16 十月 2025 09:55:35 +0800 Subject: [PATCH] 13 --- src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 456 --------------------------------------------------------- 1 files changed, 0 insertions(+), 456 deletions(-) diff --git a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java index 4ea2ac5..cfbc7fb 100644 --- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java @@ -9,7 +9,6 @@ import com.zy.asrs.entity.*; import com.zy.asrs.entity.param.*; import com.zy.asrs.mapper.BasDevpMapper; -import com.zy.asrs.mapper.ManLocDetlMapper; import com.zy.asrs.service.*; import com.zy.asrs.third.CodeDataParam; import com.zy.asrs.third.CodeParam; @@ -77,14 +76,6 @@ private CommonService commonService; @Autowired private NodeService nodeService; - @Autowired - private ManLocDetlService manLocDetlService; - @Autowired - private ManLocDetlMapper manLocDetlMapper; - @Resource - private InventoryCheckOrderService checkOrderService; - @Resource - private InventoryCheckOrderDetlService checkOrderDetlService; @Resource private BasDevpMapper basDevpMapper; @@ -573,58 +564,7 @@ } - // 鍟嗗搧涓婃灦 - @Override - public void onSale(CombParam param) { - Date now = new Date(); - // 鑾峰彇搴撲綅鍙� - String locno = param.getLocno(); - Node node = nodeService.selectByUuid(locno); - if (Cools.isEmpty(node)) { - throw new CoolException(param.getLocno() + ":搴撲綅涓嶅瓨鍦�"); - } - // 鑾峰彇鍟嗗搧鍒楄〃 - for (CombParam.CombMat combMat : param.getCombMats()) { - Mat mat = matService.selectByMatnr(combMat.getMatnr()); - if (Cools.isEmpty(mat)) { - throw new CoolException(combMat.getMatnr() + ":鍟嗗搧妗f涓嶅瓨鍦紒"); - } - if (Cools.isEmpty(combMat.getAnfme()) || combMat.getAnfme() == 0) { - throw new CoolException(combMat.getMatnr() + ":鍟嗗搧鏁伴噺鏈夎锛�"); - } - if (Cools.isEmpty(combMat.getBatch())) { -// throw new CoolException(combMat.getMatnr() + ":鍟嗗搧鎵瑰彿鏈夎锛�"); - } - ManLocDetl manLocDetl = new ManLocDetl(); - manLocDetl.setLocNo(locno); - manLocDetl.setNodeId(node.getId()); - manLocDetl.setMaktx(mat.getMaktx()); - manLocDetl.setMatnr(mat.getMatnr()); - manLocDetl.setBatch(Cools.isEmpty(combMat.getBatch()) ? "" : combMat.getBatch()); - manLocDetl.setAnfme(combMat.getAnfme()); - manLocDetl.setModiTime(now); - if (!manLocDetlService.insert(manLocDetl)) { - throw new CoolException("鍟嗗搧涓婃灦澶辫触锛�"); - } - } - } - - // 鍟嗗搧涓嬫灦 - @Override - public void offSale(OffSaleParam offSaleParam) { - ManLocDetl manLocDetl = manLocDetlMapper.selectLocNo0(offSaleParam.getLocNo(), offSaleParam.getMatnr()); - if (Cools.isEmpty(manLocDetl)) { - throw new CoolException("鏃犳鍟嗗搧锛�"); - } - double anfme = manLocDetl.getAnfme() - offSaleParam.getAnfme(); - if (anfme < 0) { - throw new CoolException("鍟嗗搧搴撳瓨涓嶈冻锛�"); - } else if (anfme == 0) { - manLocDetlMapper.deleteLocNo0(offSaleParam.getLocNo(), offSaleParam.getMatnr()); - } - manLocDetlMapper.updateAnfme0(anfme, manLocDetl.getNodeId()); - } // 鏌ユ壘鍟嗗搧 @@ -996,404 +936,8 @@ } - @Override - public void pdaAdjust(pdaAdjustParam param, Long userId) { - if (Cools.isEmpty(param)) { - throw new CoolException("鐩樼偣鍒楄〃鍙傛暟涓虹┖"); - } - for (InventoryCheckOrderDetl orderDetl : param.getParam()) { - InventoryCheckOrderDetl inventoryCheckOrderDetl = checkOrderDetlService.selectOne(new EntityWrapper<InventoryCheckOrderDetl>() - .eq("order_no", orderDetl.getOrderNo()) - .eq("matnr", orderDetl.getMatnr()) - .eq("batch", orderDetl.getBatch())); - if (Cools.isEmpty(inventoryCheckOrderDetl)) { - throw new CoolException("鏈煡璇㈠埌鐩樼偣淇℃伅"); - } - if (!inventoryCheckOrderDetl.getStatus().equals("1")) { - throw new CoolException("璇ヤ换鍔″凡鐩樼偣"); - } - inventoryCheckOrderDetl.setCheckAnfme(orderDetl.getCheckAnfme()); - inventoryCheckOrderDetl.setStatus("2"); - if (!checkOrderDetlService.updateById(inventoryCheckOrderDetl)) { - throw new CoolException("淇濆瓨鐩樼偣淇℃伅澶辫触!"); - } - - } - } - - @Override - @Transactional - public void inventoryUpload(String orderId) { - if (Cools.isEmpty(orderId)) { - throw new CoolException("鐩樼偣鍗昳d涓虹┖"); - } - InventoryCheckOrder inventoryCheckOrder = checkOrderService.selectById(orderId); - if (Cools.isEmpty(inventoryCheckOrder)) { - throw new CoolException("鏈壘鍒扮洏鐐瑰崟"); - } - if (inventoryCheckOrder.getStatus().equals("2")) { - throw new CoolException("鐩樼偣鍗曞凡鎻愪氦"); - } - int count = checkOrderDetlService.selectCount(new EntityWrapper<InventoryCheckOrderDetl>() - .eq("order_no", inventoryCheckOrder.getOrderNo()).isNull("check_anfme")); - if (count > 0) { - throw new CoolException("鏈夋湭瀹屾垚鐨勭洏鐐逛换鍔�"); - } - - List<InventoryCheckOrderDetl> checkOrderProfitDetls = checkOrderDetlService.selectList(new EntityWrapper<InventoryCheckOrderDetl>() - .eq("order_no", inventoryCheckOrder.getOrderNo()) - .addFilter("anfme < check_anfme")); - if (!checkOrderProfitDetls.isEmpty()) { - //鑾峰彇鐩樼泩鍗昿aram - InventoryErpParam erpProfitParam = getErpProfitParam(inventoryCheckOrder, checkOrderProfitDetls); - uploadErp(erpProfitParam); - } - - List<InventoryCheckOrderDetl> checkOrderDeficitDetls = checkOrderDetlService.selectList(new EntityWrapper<InventoryCheckOrderDetl>() - .eq("order_no", inventoryCheckOrder.getOrderNo()) - .addFilter("anfme > check_anfme")); - - if (!checkOrderDeficitDetls.isEmpty()) { - //鑾峰彇鐩樹簭鍗昿aram - InventoryErpParam erpDeficitParam = getErpDeficitParam(inventoryCheckOrder, checkOrderDeficitDetls); - uploadErp(erpDeficitParam); - } - - inventoryCheckOrder.setStatus("2"); - if (!checkOrderService.updateById(inventoryCheckOrder)) { - throw new CoolException("鐘舵�佹洿鏂板け璐�"); - } - - - } - - @Override - @Transactional - public void pingKuShelves(CombParam combParam, Long userId) { - Node node = nodeService.selectOne(new EntityWrapper<Node>().eq("name", combParam.getLocno()).eq("type", 3)); - if (Cools.isEmpty(node)) { - throw new CoolException("鏈壘鍒板簱浣嶄俊鎭�"); - } - - Order order = orderService.selectByNo(combParam.getOrderNo()); - if (Cools.isEmpty(order) || order.getSettle() > 2) { - throw new CoolException("鍗曟嵁缂栧彿宸茶繃鏈�"); - } - // 鐢熸垚鍏ュ簱閫氱煡妗� - List<DetlDto> detlDtos = new ArrayList<>(); - - for (CombParam.CombMat elem : combParam.getCombMats()) { - - -// param.getCombMats().forEach(elem -> { - - // 璁㈠崟鏄庣粏鏁伴噺鏍¢獙 - OrderDetl orderDetl = orderDetlService.selectItem(order.getId(), elem.getMatnr(), elem.getBatch()); - if (Cools.isEmpty(orderDetl)) { - throw new CoolException("璇ュ崟鎹腑鏈壘鍒板搴旂墿鏂欐槑缁�"); - } - if (elem.getAnfme() > orderDetl.getEnableQty()) { - throw new CoolException(orderDetl.getMatnr() + "鍏ュ簱鏁伴噺涓嶅悎娉�"); - } - // 淇敼璁㈠崟浣滀笟鏁伴噺 - if (!orderDetlService.increaseWorkQty(order.getId(), elem.getMatnr(), elem.getBatch(), elem.getAnfme())) { - throw new CoolException("淇敼鍗曟嵁浣滀笟鏁伴噺澶辫触"); - } - -// DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getAnfme(),orderDetl.getManu()); - DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getAnfme(), orderDetl.getSuppCode() - , orderDetl.getManu(), orderDetl.getSku(), orderDetl.getSupp(), orderDetl.getTemp1(), orderDetl.getTemp2(), orderDetl.getTemp3(), orderDetl.getTemp4()); - if (DetlDto.has(detlDtos, detlDto)) { - DetlDto one = DetlDto.find(detlDtos, detlDto.getMatnr(), detlDto.getBatch()); - assert one != null; - one.setAnfme(one.getAnfme() + detlDto.getAnfme()); - } else { - detlDtos.add(detlDto); - } -// }); - } - int workNo = commonService.getWorkNo(4); - Date now = new Date(); - // 鐢熸垚宸ヤ綔妗� - WrkMast wrkMast = new WrkMast(); - wrkMast.setWrkNo(workNo); - wrkMast.setIoTime(new Date()); - wrkMast.setWrkSts(4L); // 宸ヤ綔鐘舵�侊細鐢熸垚鍏ュ簱ID - wrkMast.setIoType(300); // 鍏ュ嚭搴撶姸鎬侊細1.鍏ュ簱 - wrkMast.setIoPri(12D); // 浼樺厛绾� - wrkMast.setLocNo(node.getName()); - wrkMast.setBarcode(""); // 鎵樼洏鐮� - wrkMast.setFullPlt("Y"); // 婊℃澘锛歒 - wrkMast.setPicking("N"); // 鎷f枡 - wrkMast.setExitMk("N"); // 閫�鍑� - wrkMast.setEmptyMk("N"); // 绌烘澘 - wrkMast.setLinkMis("Y"); - wrkMast.setSheetNo(order.getOrderNo()); - // 鎿嶄綔浜哄憳鏁版嵁 - wrkMast.setAppeTime(now); - wrkMast.setModiTime(now); - boolean res = wrkMastService.insert(wrkMast); - if (!res) { - throw new CoolException("淇濆瓨宸ヤ綔妗eけ璐�"); - } - for (DetlDto detlDto : detlDtos) { - Mat mat = matService.selectByMatnr(detlDto.getMatnr()); - if (Cools.isEmpty(mat)) { - throw new CoolException(detlDto.getMatnr() + "鍟嗗搧妗f涓嶅瓨鍦�"); - } - WrkDetl wrkDetl = new WrkDetl(); - - wrkDetl.sync(detlDto); - wrkDetl.sync(mat); - - wrkDetl.setOrderNo(order.getOrderNo()); - wrkDetl.setWrkNo(wrkMast.getWrkNo()); - wrkDetl.setIoTime(wrkMast.getIoTime()); - wrkDetl.setAppeTime(now); - wrkDetl.setModiTime(now); - wrkDetl.setManu(detlDto.getMark()); //鏍囪 - wrkDetl.setOrigin(order.getItemName());//浠撳簱 - wrkDetl.setSupp(detlDto.getSuppName()); //渚涘簲鍟� - wrkDetl.setSku(detlDto.getCustomer()); //瀹㈡埛鍚嶇О - wrkDetl.setThreeCode(detlDto.getOrderNo()); //u8鍙戣繃鏉ョ殑璁㈠崟鍙� - wrkDetl.setSuppCode(detlDto.getFromOrderNo()); //鏉ユ簮鍗曞彿 - wrkDetl.setTemp1(detlDto.getTemp1()); - wrkDetl.setTemp2(detlDto.getTemp2()); - wrkDetl.setTemp3(detlDto.getSuppName()); - wrkDetl.setTemp4(detlDto.getTemp4()); - if (!wrkDetlService.insert(wrkDetl)) { - throw new CoolException("淇濆瓨宸ヤ綔鏄庣粏澶辫触"); - } - } - orderService.updateSettle(order.getId(), 2L, userId); - - - } - - @Override - @Transactional - public void pingKuUnShelves(CombParam combParam, Long userId) { - String orderNo = combParam.getOrderNo(); - - Node node = nodeService.selectOne(new EntityWrapper<Node>().eq("name", combParam.getLocno()).eq("type", 3)); - if (Cools.isEmpty(node)) { - throw new CoolException("鏈壘鍒板簱浣嶄俊鎭�"); - } - //鏍规嵁璁㈠崟鍙风敓鎴愬嚭搴撲换鍔″伐浣滄。 - Order order = orderService.selectOne(new EntityWrapper<Order>().eq("order_no", orderNo)); - if (order.getSettle() != 1 && order.getSettle() != 2) { - throw new CoolException("璇ヨ鍗曞凡澶勭悊"); - } - List<DetlDto> detlDtos = new ArrayList<>(); - for (CombParam.CombMat elem : combParam.getCombMats()) { - Wrapper<ManLocDetl> manLocDetlWrapper = new EntityWrapper<ManLocDetl>().eq("loc_no", combParam.getLocno()) - .eq("matnr", elem.getMatnr()).eq("batch", elem.getBatch()) - .eq("temp3", elem.getSupp()).eq("temp1", elem.getTemp1()).eq("temp2", elem.getTemp2()); - ManLocDetl manLocDetl = manLocDetlService.selectOne(manLocDetlWrapper); - - if (Cools.isEmpty(manLocDetl)) { - throw new CoolException("璇ュ簱浣嶆湭鏌ヨ鍒拌揣鐗╀俊鎭�"); - } - if (elem.getAnfme() > manLocDetl.getAnfme()) { - throw new CoolException("鍑哄簱鏁伴噺澶т簬搴撲綅鍓╀綑鏁伴噺"); - } - - OrderDetl orderDetl = orderDetlService.selectItem(order.getId(), elem.getMatnr(), elem.getBatch()); - if (Cools.isEmpty(orderDetl)) { - throw new CoolException("璇ュ崟鎹腑鏈壘鍒板搴旂墿鏂欐槑缁�"); - } - if (elem.getAnfme() > orderDetl.getEnableQty()) { - throw new CoolException(orderDetl.getMatnr() + "鍏ュ簱鏁伴噺涓嶅悎娉�"); - } - // 淇敼璁㈠崟浣滀笟鏁伴噺 - if (!orderDetlService.increaseWorkQty(order.getId(), elem.getMatnr(), elem.getBatch(), elem.getAnfme())) { - throw new CoolException("淇敼鍗曟嵁浣滀笟鏁伴噺澶辫触"); - } - - DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getAnfme(), orderDetl.getSuppCode() - , orderDetl.getManu(), orderDetl.getSku(), orderDetl.getSupp(), orderDetl.getTemp1(), orderDetl.getTemp2(), orderDetl.getTemp3(), orderDetl.getTemp4()); - - - int workNo = commonService.getWorkNo(4); - Date now = new Date(); - // 鐢熸垚宸ヤ綔妗� - WrkMast wrkMast = new WrkMast(); - wrkMast.setWrkNo(workNo); - wrkMast.setIoTime(new Date()); - wrkMast.setWrkSts(14L); // 宸ヤ綔鐘舵�侊細鐢熸垚鍏ュ簱ID - wrkMast.setIoType(301); // 鍏ュ嚭搴撶姸鎬侊細301.骞冲簱鍑哄簱 - wrkMast.setIoPri(12D); // 浼樺厛绾� - wrkMast.setSourceLocNo(node.getName()); - wrkMast.setBarcode(""); // 鎵樼洏鐮� - wrkMast.setFullPlt("Y"); // 婊℃澘锛歒 - wrkMast.setPicking("N"); // 鎷f枡 - wrkMast.setExitMk("N"); // 閫�鍑� - wrkMast.setEmptyMk("N"); // 绌烘澘 - wrkMast.setLinkMis("Y"); - wrkMast.setSheetNo(order.getOrderNo()); - // 鎿嶄綔浜哄憳鏁版嵁 - wrkMast.setAppeTime(now); - wrkMast.setModiTime(now); - boolean res = wrkMastService.insert(wrkMast); - if (!res) { - throw new CoolException("淇濆瓨宸ヤ綔妗eけ璐�"); - } - - Mat mat = matService.selectByMatnr(detlDto.getMatnr()); - if (Cools.isEmpty(mat)) { - throw new CoolException(detlDto.getMatnr() + "鍟嗗搧妗f涓嶅瓨鍦�"); - } - WrkDetl wrkDetl = new WrkDetl(); - - wrkDetl.sync(detlDto); - wrkDetl.sync(mat); - - wrkDetl.setOrderNo(order.getOrderNo()); - wrkDetl.setWrkNo(wrkMast.getWrkNo()); - wrkDetl.setIoTime(wrkMast.getIoTime()); - wrkDetl.setAppeTime(now); - wrkDetl.setModiTime(now); - wrkDetl.setManu(detlDto.getMark()); //鏍囪 - wrkDetl.setOrigin(order.getItemName());//浠撳簱 - wrkDetl.setSupp(detlDto.getSuppName()); //渚涘簲鍟� - wrkDetl.setSku(detlDto.getCustomer()); //瀹㈡埛鍚嶇О - wrkDetl.setThreeCode(detlDto.getOrderNo()); //u8鍙戣繃鏉ョ殑璁㈠崟鍙� - wrkDetl.setSuppCode(detlDto.getFromOrderNo()); //鏉ユ簮鍗曞彿 - wrkDetl.setTemp1(detlDto.getTemp1()); - wrkDetl.setTemp2(detlDto.getTemp2()); - wrkDetl.setTemp3(detlDto.getTemp3()); - wrkDetl.setTemp4(detlDto.getTemp4()); - if (!wrkDetlService.insert(wrkDetl)) { - throw new CoolException("淇濆瓨宸ヤ綔鏄庣粏澶辫触"); - } - - if (new BigDecimal(manLocDetl.getAnfme()).subtract(new BigDecimal(elem.getAnfme())).doubleValue() == 0) { - manLocDetlService.delete(manLocDetlWrapper); - } else { - manLocDetl.setAnfme(new BigDecimal(manLocDetl.getAnfme()).subtract(new BigDecimal(elem.getAnfme())).doubleValue()); - if (!manLocDetlService.update(manLocDetl, manLocDetlWrapper)) { - throw new CoolException("鏇存柊鏄庣粏澶辫触"); - } - } - - - } - orderService.updateSettle(order.getId(), 2L, userId); - - - } - - public void uploadErp(InventoryErpParam param) { -// String response = ""; -// boolean success = false; -// try { -// HashMap<String, Object> headers = new HashMap<>(); -// headers.put("Content-Type", "application/json"); -// response = new HttpHandler.Builder() -// .setHeaders(headers) -// .setUri("10.0.100.160:30108") -// .setPath("web/apps/gongqi.df.dataTrans/DTInterFace/doJobWithupdateBody") -// .setJson(JSON.toJSONString(param)) -// .build() -// .doPost(); -// JSONObject jsonObject = JSON.parseObject(response); -// if (jsonObject.getInteger("errcode").equals(0)) { -// success = true; -// } else if (jsonObject.getInteger("errcode").equals(1)) { -// log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", MesConstant.URL+MesConstant.PACK_DOWN_URL, JSON.toJSONString(param), response); -// throw new CoolException(jsonObject.getString("msg")); -// } else { -// log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", MesConstant.URL+MesConstant.PACK_DOWN_URL, JSON.toJSONString(param), response); -// throw new CoolException("涓婃姤mes绯荤粺澶辫触"); -// } -// } catch (Exception e) { -// log.error("fail", e); -// throw new CoolException(e.getMessage()); -// } finally { -// try { -// // 淇濆瓨鎺ュ彛鏃ュ織 -// apiLogService.save( -// "鐩樼偣鍗曚笂鎶�", -// url , -// null, -// "127.0.0.1", -// JSON.toJSONString(param), -// response, -// success -// ); -// } catch (Exception e) { log.error("", e); } -// } - } - - public InventoryErpParam getErpProfitParam(InventoryCheckOrder inventoryCheckOrder, List<InventoryCheckOrderDetl> checkOrderProfitDetls) { - Date date = new Date(); - InventoryErpParam erpProfitParam = new InventoryErpParam(); - InventoryErpParam.DataJson dataJson = new InventoryErpParam.DataJson(); - dataJson.setFlowCode("LIKUwms12GOTmes"); - dataJson.setTableCode("DTInventInTable_pdd"); - dataJson.setLogName("鐩樼泩鍗�-鍏ュ簱鍗�"); - erpProfitParam.setDataJson(dataJson); - List<InventoryErpParam.UpdateJson> updateJsonList = new ArrayList<>(); - InventoryErpParam.UpdateJson updateJson = new InventoryErpParam.UpdateJson(); - updateJson.setOrderNo(inventoryCheckOrder.getOrderNo()); - updateJson.setDate(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(date)); - List<InventoryErpParam.MatDetails> matDetails = new ArrayList<>(); - for (InventoryCheckOrderDetl checkOrderProfitDetl : checkOrderProfitDetls) { - InventoryErpParam.MatDetails matDetail = new InventoryErpParam.MatDetails(); - - Mat mat = matService.selectByMatnr(checkOrderProfitDetl.getMatnr()); - - matDetail.setMatnr(checkOrderProfitDetl.getMatnr()); - matDetail.setBatch(checkOrderProfitDetl.getBatch()); - matDetail.setSpecs(mat.getSpecs()); - Double anfme = new BigDecimal(checkOrderProfitDetl.getCheckAnfme()).subtract(new BigDecimal(checkOrderProfitDetl.getAnfme())).doubleValue(); - matDetail.setAnfme(anfme); - matDetail.setLocNo(checkOrderProfitDetl.getLocNo()); - matDetail.setWarehouse(checkOrderProfitDetl.getArea()); - matDetail.setSeq(updateJson.getMatDetails() == null ? 1 : updateJson.getMatDetails().size() + 1); - matDetails.add(matDetail); - } - updateJson.setMatDetails(matDetails); - updateJsonList.add(updateJson); - erpProfitParam.setUpdateJson(updateJsonList); - return erpProfitParam; - } - - public InventoryErpParam getErpDeficitParam(InventoryCheckOrder inventoryCheckOrder, List<InventoryCheckOrderDetl> checkOrderDeficitDetls) { - Date date = new Date(); - InventoryErpParam erpDeficitParam = new InventoryErpParam(); - InventoryErpParam.DataJson dataJson = new InventoryErpParam.DataJson(); - dataJson.setFlowCode("LIKUwms12GOTmes"); - dataJson.setTableCode("DTInventOutTable_pdd"); - dataJson.setLogName("鐩樹簭鍗�-鍑哄簱鍗�"); - erpDeficitParam.setDataJson(dataJson); - List<InventoryErpParam.UpdateJson> updateJsonList2 = new ArrayList<>(); - InventoryErpParam.UpdateJson updateJson2 = new InventoryErpParam.UpdateJson(); - updateJson2.setOrderNo(inventoryCheckOrder.getOrderNo()); - updateJson2.setDate(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(date)); - List<InventoryErpParam.MatDetails> matDetails = new ArrayList<>(); - for (InventoryCheckOrderDetl checkOrderDeficitDetl : checkOrderDeficitDetls) { - InventoryErpParam.MatDetails matDetail = new InventoryErpParam.MatDetails(); - - Mat mat = matService.selectByMatnr(checkOrderDeficitDetl.getMatnr()); - - matDetail.setMatnr(checkOrderDeficitDetl.getMatnr()); - matDetail.setBatch(checkOrderDeficitDetl.getBatch()); - matDetail.setSpecs(mat.getSpecs()); - Double anfme = new BigDecimal(checkOrderDeficitDetl.getAnfme()).subtract(new BigDecimal(checkOrderDeficitDetl.getCheckAnfme())).doubleValue(); - matDetail.setAnfme(anfme); - matDetail.setLocNo(checkOrderDeficitDetl.getLocNo()); - matDetail.setWarehouse(checkOrderDeficitDetl.getArea()); - matDetail.setSeq(updateJson2.getMatDetails() == null ? 1 : updateJson2.getMatDetails().size() + 1); - matDetails.add(matDetail); - } - updateJson2.setMatDetails(matDetails); - updateJsonList2.add(updateJson2); - erpDeficitParam.setUpdateJson(updateJsonList2); - return erpDeficitParam; - } @Override @Transactional -- Gitblit v1.9.1