zy-asrs.git - Gitblit

			@@ -263,7 +263,7 @@
			JSONArray data = jsonResponse.getJSONObject("data").getJSONArray("rows");
			if(data.size()<=0) continue;
			//商品档案同步
			if (kingDeeUtilType.formId.equals("BD_MATERIAL")) {
			if(kingDeeUtilType.formId.equals("BD_MATERIAL")) {
			Tag tag = tagService.selectByName("全部", 1);
			// 处理分页：根据返回的totalCount和pageSize计算页数
			int pageSize = jsonResponse.getJSONObject("data").getIntValue("pageSize");
			@@ -558,6 +558,12 @@
			callApiLogSaveOrder(order,kingDeeUtilType, "编号商品检索失败，请先添加商品"+matnr, false);
			continue;
			}
			if (mat.getSafeQty() == null \|\| mat.getSafeQty() == 0) {
			callApiLogSaveOrder(order, kingDeeUtilType,
			"档案箱数量异常：" + matnr, false);
			continue;
			}
			Double erpAnfme = anfme*mat.getSafeQty();
			Order order1 = orderService.selectByNo( billNo);
			List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order1.getId());
			boolean sign = false;
			@@ -579,7 +585,7 @@
			orderDetl.setThreeCode(detlId);//ERP明细id
			orderDetl.setLineNumber(seq);//分录行号
			orderDetl.setAnfme(anfme);//总箱数
			orderDetl.setErpAnfme(anfme);//erp数据
			orderDetl.setErpAnfme(erpAnfme);//erp数据
			orderDetl.setOrderId(order.getId());
			orderDetl.setOrderNo(order.getOrderNo());//表头单据
			orderDetl.setSupp(supp);//供应商名称（货源）
			@@ -735,6 +741,12 @@
			"商品不存在：" + matnr, false);
			continue;
			}
			if (mat.getSafeQty() == null \|\| mat.getSafeQty() == 0) {
			callApiLogSaveOrder(order, kingDeeUtilType,
			"档案箱数量异常：" + matnr, false);
			continue;
			}
			Double erpAnfme = anfme*mat.getSafeQty();
			// ========= 明细去重 =========
			List<OrderDetl> orderDetls =
			orderDetlService.selectByOrderId(order.getId());
			@@ -754,7 +766,7 @@
			orderDetl.setThreeCode(detlId);
			orderDetl.setLineNumber(seq);
			orderDetl.setAnfme(anfme);
			orderDetl.setErpAnfme(anfme);
			orderDetl.setErpAnfme(erpAnfme);
			orderDetl.setOrderId(order.getId());
			orderDetl.setOrderNo(order.getOrderNo());
			orderDetl.setSupp(supp);
			@@ -901,6 +913,12 @@
			"商品不存在：" + matnr, false);
			continue;
			}
			if (mat.getSafeQty() == null \|\| mat.getSafeQty() == 0) {
			callApiLogSaveOrder(order, kingDeeUtilType,
			"档案箱数量异常：" + matnr, false);
			continue;
			}
			Double erpAnfme = anfme*mat.getSafeQty();
			// ========= 明细去重 =========
			List<OrderDetl> orderDetls =
			orderDetlService.selectByOrderId(order.getId());
			@@ -920,7 +938,7 @@
			orderDetl.setThreeCode(detlId);
			orderDetl.setLineNumber(seq);
			orderDetl.setAnfme(anfme);
			orderDetl.setErpAnfme(anfme);
			orderDetl.setErpAnfme(erpAnfme);
			orderDetl.setOrderId(order.getId());
			orderDetl.setOrderNo(order.getOrderNo());
			orderDetl.setSupp(supp);
			@@ -1209,6 +1227,10 @@
			String detlId = entry.getString("id"); //明细id
			Long seq = entry.getLong("seq"); //分录行号
			// String suppCode = entry.getString("supplier_number");
			if(anfme == 0){
			callApiLogSaveOrder(order,kingDeeUtilType, "单据数量异常"+matnr, false);
			continue;
			}
			String suppCode = null;
			if (anfme == null \|\| anfme == 0) {
			callApiLogSaveOrder(order, kingDeeUtilType,
			@@ -1222,7 +1244,12 @@
			"物料档案不存在：" + matnr, false);
			continue;
			}
			anfmeBox = anfme/mat.getSafeQty();
			if (mat.getSafeQty() == null \|\| mat.getSafeQty() == 0) {
			callApiLogSaveOrder(order, kingDeeUtilType,
			"档案箱数量异常：" + matnr, false);
			continue;
			}
			anfmeBox = Math.floor(anfme / mat.getSafeQty());
			// ========= 明细去重 =========
			List<OrderDetl> orderDetls =
			orderDetlService.selectByOrderId(order.getId());
			@@ -1238,40 +1265,36 @@
			// supp = locSupp.getOwner();
			// }
			// ========= 保存明细 =========
			try{
			OrderDetl orderDetl = new OrderDetl();
			orderDetl.sync(mat);
			orderDetl.setThreeCode(detlId);
			orderDetl.setLineNumber(seq);
			orderDetl.setAnfme(anfmeBox);
			orderDetl.setErpAnfme(anfme);
			orderDetl.setOrderId(order.getId());
			orderDetl.setOrderNo(order.getOrderNo());
			orderDetl.setSupp(supp);
			orderDetl.setSuppCode(suppCode);
			orderDetl.setSku(matnr);
			orderDetl.setStandby1(s1);
			orderDetl.setStandby2(s2);
			orderDetl.setStandby3(s3);
			orderDetl.setBoxType1(owner);
			orderDetl.setBoxType2(ownerUuid);
			orderDetl.setBoxType3(pOrderNo);
			orderDetl.setMemo(memo);
			orderDetl.setVolume(totalVolume);
			orderDetl.setSafeQty(totalNumItems);
			orderDetl.setManu(warehouse);
			orderDetl.setCreateBy(9527L);
			orderDetl.setCreateTime(new Date());
			orderDetl.setUpdateBy(9527L);
			orderDetl.setUpdateTime(new Date());
			orderDetl.setStatus(1);
			orderDetl.setQty(0.0D);
			OrderDetl orderDetl = new OrderDetl();
			orderDetl.sync(mat);
			orderDetl.setThreeCode(detlId);
			orderDetl.setLineNumber(seq);
			orderDetl.setAnfme(anfmeBox);
			orderDetl.setErpAnfme(anfme);
			orderDetl.setOrderId(order.getId());
			orderDetl.setOrderNo(order.getOrderNo());
			orderDetl.setSupp(supp);
			orderDetl.setSuppCode(suppCode);
			orderDetl.setSku(matnr);
			orderDetl.setStandby1(s1);
			orderDetl.setStandby2(s2);
			orderDetl.setStandby3(s3);
			orderDetl.setBoxType1(owner);
			orderDetl.setBoxType2(ownerUuid);
			orderDetl.setBoxType3(pOrderNo);
			orderDetl.setMemo(memo);
			orderDetl.setVolume(totalVolume);
			orderDetl.setSafeQty(totalNumItems);
			orderDetl.setManu(warehouse);
			orderDetl.setCreateBy(9527L);
			orderDetl.setCreateTime(new Date());
			orderDetl.setUpdateBy(9527L);
			orderDetl.setUpdateTime(new Date());
			orderDetl.setStatus(1);
			orderDetl.setQty(0.0D);

			orderDetlService.insert(orderDetl);
			} catch (Exception e) {
			// 如果发生异常，记录详细的错误信息
			callApiLogSaveOrder(order, kingDeeUtilType, "保存明细失败，物料：" + matnr + " 错误信息：" + e.getMessage(), false);
			}
			orderDetlService.insert(orderDetl);

			}
			}

			@@ -1395,7 +1418,12 @@
			"商品不存在：" + matnr, false);
			continue;
			}
			anfmeBox = anfme/mat.getSafeQty();
			if (mat.getSafeQty() == null \|\| mat.getSafeQty() == 0) {
			callApiLogSaveOrder(order, kingDeeUtilType,
			"档案箱数量异常：" + matnr, false);
			continue;
			}
			anfmeBox = Math.floor(anfme / mat.getSafeQty());
			// ========= 明细去重 =========
			List<OrderDetl> orderDetls =
			orderDetlService.selectByOrderId(order.getId());
			@@ -1410,40 +1438,36 @@
			supp = locSupp.getOwner();
			}
			// ========= 保存明细 =========
			try{
			OrderDetl orderDetl = new OrderDetl();
			orderDetl.sync(mat);
			orderDetl.setThreeCode(detlId);
			orderDetl.setLineNumber(seq);
			orderDetl.setAnfme(anfmeBox);
			orderDetl.setErpAnfme(anfme);
			orderDetl.setOrderId(order.getId());
			orderDetl.setOrderNo(order.getOrderNo());
			orderDetl.setSupp(supp);
			orderDetl.setSuppCode(suppCode);
			orderDetl.setSku(matnr);
			orderDetl.setStandby1(s1);
			orderDetl.setStandby2(s2);
			orderDetl.setStandby3(s3);
			orderDetl.setBoxType1(owner);
			orderDetl.setBoxType2(ownerUuid);
			orderDetl.setBoxType3(pOrderNo);
			orderDetl.setMemo(memo);
			orderDetl.setVolume(totalVolume);
			orderDetl.setSafeQty(totalNumItems);
			orderDetl.setManu(warehouse);
			orderDetl.setCreateBy(9527L);
			orderDetl.setCreateTime(new Date());
			orderDetl.setUpdateBy(9527L);
			orderDetl.setUpdateTime(new Date());
			orderDetl.setStatus(1);
			orderDetl.setQty(0.0D);

			orderDetlService.insert(orderDetl);
			} catch (Exception e) {
			// 如果发生异常，记录详细的错误信息
			callApiLogSaveOrder(order, kingDeeUtilType, "保存明细失败，物料：" + matnr + " 错误信息：" + e.getMessage(), false);
			}
			OrderDetl orderDetl = new OrderDetl();
			orderDetl.sync(mat);
			orderDetl.setThreeCode(detlId);
			orderDetl.setLineNumber(seq);
			orderDetl.setAnfme(anfmeBox);
			orderDetl.setErpAnfme(anfme);
			orderDetl.setOrderId(order.getId());
			orderDetl.setOrderNo(order.getOrderNo());
			orderDetl.setSupp(supp);
			orderDetl.setSuppCode(suppCode);
			orderDetl.setSku(matnr);
			orderDetl.setStandby1(s1);
			orderDetl.setStandby2(s2);
			orderDetl.setStandby3(s3);
			orderDetl.setBoxType1(owner);
			orderDetl.setBoxType2(ownerUuid);
			orderDetl.setBoxType3(pOrderNo);
			orderDetl.setMemo(memo);
			orderDetl.setVolume(totalVolume);
			orderDetl.setSafeQty(totalNumItems);
			orderDetl.setManu(warehouse);
			orderDetl.setCreateBy(9527L);
			orderDetl.setCreateTime(new Date());
			orderDetl.setUpdateBy(9527L);
			orderDetl.setUpdateTime(new Date());
			orderDetl.setStatus(1);
			orderDetl.setQty(0.0D);

			orderDetlService.insert(orderDetl);
			}
			}
			}
			@@ -1478,6 +1502,7 @@
			String owner = "和得科技";
			String ownerUuid = "BU-00001";
			String orderId = jsonObjectNew.getString("id");
			String manuBill = jsonObjectNew.getString("manufacturenun");
			// ========= 货主校验 =========
			LocOwner locOwner = locOwnerService.selectByUuid(ownerUuid);
			// if (locOwner == null) {
			@@ -1498,7 +1523,7 @@
			null, // 项目编号
			orderId, //收料单id
			null, // 调拨项目编号
			null, // 初始票据号
			manuBill, // 初始票据号
			null, // 票据号
			null, // 项目id
			owner, // 货主
			@@ -1567,7 +1592,7 @@
			"商品不存在：" + matnr, false);
			continue;
			}
			anfmeBox = anfme/mat.getSafeQty();
			anfmeBox = Math.floor(anfme / mat.getSafeQty());
			// ========= 明细去重 =========
			List<OrderDetl> orderDetls =
			orderDetlService.selectByOrderId(order.getId());