From c5e3523a7d83ae4d71493fb31327781099e2bbb3 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期四, 25 四月 2024 17:04:09 +0800
Subject: [PATCH] ERP物料同步，单据同步
---
src/main/java/com/zy/system/controller/LicenseCreatorController.java | 28 +-
src/main/java/com/zy/asrs/entity/param/OrderProdSyncParam.java | 49 +++++
src/main/java/com/zy/system/entity/license/CustomLicenseManager.java | 2
src/main/java/com/zy/asrs/controller/OpenController.java | 86 ++++++--
src/main/java/com/zy/asrs/entity/param/MatSyncParam.java | 77 ++-----
src/main/java/com/zy/asrs/entity/param/OrderSyncParam.java | 67 +++++++
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 183 +++++++++----------
src/main/java/com/zy/asrs/service/OpenService.java | 6
src/main/resources/application.yml | 5
9 files changed, 306 insertions(+), 197 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index cae3801..06b718e 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -156,27 +156,9 @@
if (Cools.isEmpty(param)) {
return R.parse(BaseRes.PARAM);
}
- MatSyncParam matSyncParam = openService.syncMat(param);
- if (Cools.isEmpty(matSyncParam.getMats()) || matSyncParam.getMats().size() <=0 ) {
- return R.error("鏁版嵁寮傚父");
- }
- StringBuilder Msg= new StringBuilder("鍘熷洜锛�");
- int MsgT=0,MsgF=0;
- for (MatSyncParam.Mats matParam:matSyncParam.getMats()){
- if (matParam.isType()){
- MsgT++;
- }else {
- MsgF++;
- Msg.append(matParam.getMatnr()).append(":").append(matParam.getMemo()).append(";");
- }
- }
- if (MsgF==0){
- return R.ok("鎴愬姛鎺ユ敹鐗╂枡锛�"+MsgT+"涓�");
- }else if (MsgT==0){
- return R.ok("鎺ユ敹鐗╂枡澶辫触锛�"+MsgF+"涓�;"+Msg);
- }else {
- return R.ok("鎴愬姛鎺ユ敹鐗╂枡锛�"+MsgT+"涓�;"+"鎺ユ敹鐗╂枡澶辫触锛�"+MsgF+"涓�;"+Msg);
- }
+ openService.syncMat(param);
+
+ return R.ok("鏇存柊鎴愬姛");
}
@@ -299,23 +281,23 @@
@PostMapping("/order/pakin/default/v1")
@AppAuth(memo = "鐢熸垚鍏ュ簱鍗曟嵁")
public synchronized R orderPakin(@RequestHeader(required = false) String appkey,
- @RequestBody(required = false) Map<String, Object> param,
+ @RequestBody(required = true) OrderSyncParam param,
HttpServletRequest request){
auth(appkey, param, request);
if (Cools.isEmpty(param)) {
return R.parse(BaseRes.PARAM);
}
- openService.syncOrder(param,true);
+ openService.syncOrder(param,true,"閲囪喘鍏ュ簱鍗�");
return R.ok("鍏ュ簱鍗曟嵁鎺ュ彈鎴愬姛");
}
@PostMapping("/order/pakout/default/v1")
- @AppAuth(memo = "鐢熸垚鍑哄簱鍗曟嵁")
+ @AppAuth(memo = "鍚屾宸ュ崟鍗曟嵁")
public synchronized R orderPakout(@RequestHeader(required = false) String appkey,
- @RequestBody(required = false) Map<String, Object> param,
+ @RequestBody(required = false) OrderProdSyncParam param,
HttpServletRequest request){
auth(appkey, param, request);
@@ -323,7 +305,9 @@
return R.parse(BaseRes.PARAM);
}
- openService.syncOrder(param,false);
+ openService.syncOrder(mappingPakInOrderParam(param),true,"鐢熶骇鍏ュ簱鍗�");
+ openService.syncOrder(mappingPakOutOrderParam(param),false,"鐢熶骇鍑哄簱鍗�");
+
return R.ok("鍑哄簱鍗曟嵁鎺ュ彈鎴愬姛");
@@ -349,4 +333,54 @@
}
+ private OrderSyncParam mappingPakInOrderParam(OrderProdSyncParam param){
+ //鐢熸垚鍗曟嵁涓讳綋
+ OrderSyncParam orderSyncParam = new OrderSyncParam();
+ orderSyncParam.setCPOID(param.getOrderNoT());
+ orderSyncParam.setDdate(param.getOrderTime());
+ orderSyncParam.setCMemo("");
+
+ //鐢熸垚鍗曟嵁鏄庣粏
+ OrderSyncParam.OrderDetl orderDetl = new OrderSyncParam.OrderDetl();
+ orderDetl.setCInvCode(param.getCInvCode());
+ orderDetl.setIQuantity(param.getIQuantity());
+ orderDetl.setCsocode(param.getCsocode());
+ orderDetl.setBFree1(null);
+
+ //娣诲姞鍗曟嵁鏄庣粏鍒板崟鎹富浣�
+ List<OrderSyncParam.OrderDetl> orderDetls = new ArrayList<>();
+ orderDetls.add(orderDetl);
+
+ orderSyncParam.setChildren(orderDetls);
+
+ return orderSyncParam;
+ }
+
+ private OrderSyncParam mappingPakOutOrderParam(OrderProdSyncParam param){
+ OrderSyncParam orderSyncParam = new OrderSyncParam();
+
+ List<OrderProdSyncParam.ChildInfo> child = param.getChild();
+
+ //鐢熸垚鍗曟嵁涓讳綋
+ orderSyncParam.setCPOID(child.get(0).getOrderNoT());
+ orderSyncParam.setDdate(param.getOrderTime());
+ orderSyncParam.setCMemo("");
+
+ //鐢熸垚鍗曟嵁鏄庣粏
+ List<OrderSyncParam.OrderDetl> orderDetls = new ArrayList<>();
+
+ for(OrderProdSyncParam.ChildInfo childInfo : child){
+ OrderSyncParam.OrderDetl orderDetl = new OrderSyncParam.OrderDetl();
+ orderDetl.setCInvCode(childInfo.getCInvCode());
+ orderDetl.setIQuantity(childInfo.getIQuantity());
+ orderDetl.setCsocode(param.getCsocode());
+ orderDetl.setBFree1(childInfo.getBFree1());
+ orderDetl.setID(childInfo.getIDs() + "");
+ orderDetls.add(orderDetl);
+ }
+ orderSyncParam.setChildren(orderDetls);
+
+ return orderSyncParam;
+ }
+
}
diff --git a/src/main/java/com/zy/asrs/entity/param/MatSyncParam.java b/src/main/java/com/zy/asrs/entity/param/MatSyncParam.java
index 48ab7a4..ec130d0 100644
--- a/src/main/java/com/zy/asrs/entity/param/MatSyncParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/MatSyncParam.java
@@ -2,8 +2,6 @@
import lombok.Data;
-import java.util.List;
-
/**
* 鍟嗗搧鍚屾鎺ュ彛锛屽弬鏁�
* Created on 2022/6/22
@@ -11,54 +9,31 @@
@Data
public class MatSyncParam {
- public List<Mats> mats;
-
- @Data
- public static class Mats{
- /**
- * 鎺ユ敹鎴愬姛锛歵rue
- * 鎺ユ敹澶辫触锛歠alse
- */
- private boolean type=true;
- /**
- * 鍟嗗搧缂栧彿
- */
- private String matnr;
-
- /**
- * 鍟嗗搧鍚嶇О
- */
- private String maktx;
-
- /**
- * 瑙勬牸
- */
- private String specs;
-
- /**
- * 鍨嬪彿
- */
- private String model;
-
- /**
- * 棰滆壊
- */
- private String color;
-
- /**
- * 鍗曚綅
- */
- private String unit;
-
- /**
- * 鍗曚綅閲�
- */
- private Double units;
-
- /**
- * 澶囨敞
- */
- private String memo;
- }
+ //瀛樿揣缂栫爜
+ String cInvCode;
+ //瀛樿揣鍚嶇О
+ String cInvName;
+ //鍗曚綅缁勭被鍨嬬紪鐮�/鍚嶇О
+ String iGroupType;
+ //瀛樿揣澶х被缂栫爜
+ String cInvCCode;
+ //瑙勬牸鍨嬪彿
+ String cInvStd;
+ //鏄惁鎵规绠＄悊
+ Integer bInvBatch;
+ //涓昏閲忓崟浣嶇紪鐮�/鍚嶇О
+ String cComUnitCode;
+ //閲囪喘鍗曚綅缂栫爜/閲囪喘鍗曚綅鍚嶇О
+ String cComUnitName;
+ //閲囪喘鍗曚綅缂栫爜
+ String PuCote;
+ //鐢熶骇璁￠噺鍗曚綅鍚嶇О
+ String proname;
+ //鐢熶骇璁￠噺鍗曚綅缂栫爜
+ String procode;
+ //鑷敱椤�1(瑙勬牸)
+ String bFree1;
+ //鐘舵��
+ Integer states;
}
diff --git a/src/main/java/com/zy/asrs/entity/param/OrderProdSyncParam.java b/src/main/java/com/zy/asrs/entity/param/OrderProdSyncParam.java
new file mode 100644
index 0000000..c89230e
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/param/OrderProdSyncParam.java
@@ -0,0 +1,49 @@
+package com.zy.asrs.entity.param;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class OrderProdSyncParam {
+ //宸ュ崟鍙�
+ private String orderNo;
+ //宸ュ崟鍙稵
+ private String orderNoT;
+ //寮�鍗曟棩鏈�
+ private String orderTime;
+ //鍗曟嵁琛屽彿
+ private String ivouchrowno;
+ //浜у搧缂栫爜
+ private String cInvCode;
+ //鐢熶骇璁㈠崟鍙�
+ private String csocode;
+ //鐢熶骇鏁伴噺
+ private Double iQuantity;
+ //鐘舵��
+ private Integer status;
+ //瀛愪欢淇℃伅
+ private List<ChildInfo> child;
+
+ /**
+ * 鐢ㄤ簬鐢熸垚鍑哄簱鍗曟嵁
+ */
+ @Data
+ public static class ChildInfo{
+ //ID
+ private Integer ID;
+ //IDs
+ private Integer IDs;
+ //宸ュ崟鍙稵
+ private String orderNoT;
+ //鐗╂枡缂栫爜
+ private String cInvCode;
+ //鏁伴噺
+ private Double iQuantity;
+ //瑙勬牸锛堣嚜鐢遍」1锛�
+ private String bFree1;
+
+
+ }
+
+}
diff --git a/src/main/java/com/zy/asrs/entity/param/OrderSyncParam.java b/src/main/java/com/zy/asrs/entity/param/OrderSyncParam.java
new file mode 100644
index 0000000..fb52a63
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/param/OrderSyncParam.java
@@ -0,0 +1,67 @@
+package com.zy.asrs.entity.param;
+
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+@Data
+public class OrderSyncParam {
+ //閲囪喘璁㈠崟缂栧彿
+ private String cPOID;
+ //渚涘簲鍟嗙紪鐮�
+ private String cVenCode;
+ //璁㈠崟鎵�鏈変汉
+ private String cPersonCode;
+ //浜よ揣鏂瑰紡
+ private String cSCCode;
+ //甯佺
+ private String cexch_name;
+ //姹囩巼
+ private Double nflat;
+ //璁㈠崟澶囨敞
+ private String cMemo;
+ //鐘舵��
+ private Integer states;
+ //鍗曟嵁鏃ユ湡
+ private String ddate;
+
+ private List<OrderDetl> children;
+
+ @Data
+ public static class OrderDetl{
+ //閲囪喘璁㈠崟琛屽彿
+ private String ivouchrowno;
+ //鐗╂枡缂栫爜
+ private String cInvCode;
+ //闇�姹傛椂闂�
+ private Date dArriveDate;
+ //闇�姹傛暟閲�
+ private Double iQuantity;
+ //鍚◣鍗曚环
+ private Double iTaxPrice;
+ //绋庣巼
+ private Double iPerTaxRate;
+ //琛屽娉�
+ private String cbMemo;
+ //浠舵暟
+ private Double iNum;
+ //鍗曟嵁鏉ユ簮
+ private String cSource;
+ //鐢熶骇璁㈠崟鍙凤紙閿�鍞鍗曞彿锛�
+ private String cDefine22;
+ //琛岀姸鎬�
+ private String Rstates;
+ //閿�鍞鍗曞彿 锛堝弬鐓ч攢鍞鍗曠敓鎴愶級
+ private String csocode;
+ //瑙勬牸锛堣嚜鐢遍」1锛�
+ private String bFree1;
+ //閲囪喘璁㈠崟瀛愯〃鏍囪瘑
+ private String ID;
+ //閿�鍞鍗曞瓙琛ㄦ爣璇�
+ private String iorderdid;
+
+ }
+
+
+}
diff --git a/src/main/java/com/zy/asrs/service/OpenService.java b/src/main/java/com/zy/asrs/service/OpenService.java
index 23d0c70..58e5630 100644
--- a/src/main/java/com/zy/asrs/service/OpenService.java
+++ b/src/main/java/com/zy/asrs/service/OpenService.java
@@ -1,12 +1,12 @@
package com.zy.asrs.service;
+import com.zy.asrs.entity.Mat;
import com.zy.asrs.entity.ViewWorkInBean;
import com.zy.asrs.entity.param.*;
import com.zy.asrs.entity.result.OpenOrderCompeteResult;
import com.zy.asrs.entity.result.StockVo;
import java.util.List;
-import java.util.Map;
public interface OpenService {
@@ -44,7 +44,7 @@
* 鍚屾鍟嗗搧淇℃伅
* @param param
*/
- MatSyncParam syncMat(MatSyncParam param);
+ Mat syncMat(MatSyncParam param);
/**
* 鍏ュ簱閫氱煡妗ｇ敓鎴�
@@ -71,7 +71,7 @@
* 鐢熸垚鍑哄叆搴撳崟鎹�
* @param param
*/
- boolean syncOrder(Map<String, Object> param, boolean pakin);
+ boolean syncOrder(OrderSyncParam param, boolean pakin, String docName);
/**
* 鐢熸垚鍑哄叆搴撳崟鎹�
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 536b54f..d882f6a 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -25,7 +25,6 @@
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
-import java.util.Map;
/**
* Created by vincent on 2022/4/9
@@ -448,51 +447,57 @@
}
@Override
@Transactional
- public MatSyncParam syncMat(MatSyncParam param) {
- if (Cools.isEmpty(param.getMats()) || param.getMats().size() <=0 ) {
+ public Mat syncMat(MatSyncParam param) {
+ if (Cools.isEmpty(param.getCInvCode()) ) {
throw new CoolException("鍟嗗搧鏁版嵁涓虹┖");
}
- MatSyncParam matSyncParam = new MatSyncParam();
- ArrayList<MatSyncParam.Mats> matParams = new ArrayList<>();
Tag tag = tagService.selectByName("鍏ㄩ儴", 1);
- for (MatSyncParam.Mats matParam : param.getMats()){
- Date date = new Date();
- Mat mat = matService.selectByMatnr(matParam.getMatnr());
- if (Cools.isEmpty(mat)) {
- Mat matNew = new Mat();
- matNew.setTagId(tag.getId());
- matNew.setMatnr(matParam.getMatnr());//鐗╂枡缂栫爜
- matNew.setMaktx(matParam.getMaktx());//鐗╂枡鍚嶇О
- matNew.setSpecs(matParam.getSpecs());//瑙勬牸
- matNew.setModel(matParam.getModel());//鍨嬪彿
- matNew.setColor(matParam.getColor());//棰滆壊
- matNew.setUnit(matParam.getUnit());//鍗曚綅
- matNew.setMemo(matParam.getMemo());//澶囨敞
- matNew.setCreateBy(9999L);//9999琛ㄧずerp涓嬪彂
- matNew.setCreateTime(date);
- matNew.setUpdateBy(9999L);//9999琛ㄧずerp涓嬪彂
- matNew.setUpdateTime(date);
- if (matService.insert(matNew)) {
- callApiLogSave(matParam, "/open/asrs/mat/v1", "鎺ユ敹ERP涓嬪彂鍟嗗搧淇℃伅鎴愬姛锛佹坊鍔犲晢鍝佷俊鎭垚鍔燂紒", true);
- matParam.setType(true);
- } else {
- callApiLogSave(matParam, "/open/asrs/mat/v1", "娣诲姞ERP涓嬪彂鍟嗗搧淇℃伅澶辫触锛侊紒锛佺姸鎬佸紓甯革紒锛侊紒", false);
- matParam.setType(false);
- matParam.setMemo("娣诲姞ERP涓嬪彂鍟嗗搧淇℃伅澶辫触锛�");
- }
+
+ Mat mat = matService.selectByMatnr(param.getCInvCCode());
+ if (Cools.isEmpty(mat)) {
+ mat = new Mat();
+ mat.setTagId(tag.getId());
+ syncMat(mat,param);
+ if (matService.insert(mat)) {
+ callApiLogSave(mat, "/open/asrs/mat/v1", "鎺ユ敹ERP涓嬪彂鍟嗗搧淇℃伅鎴愬姛锛佹坊鍔犲晢鍝佷俊鎭垚鍔燂紒", true);
} else {
- callApiLogSave(matParam, "/open/asrs/mat/v1", "鎺ユ敹ERP涓嬪彂鍟嗗搧淇℃伅澶辫触锛侊紒锛佸晢鍝佸凡瀛樺湪锛侊紒锛�", false);
- matParam.setType(false);
- matParam.setMemo("鍟嗗搧宸插瓨鍦紒");
+ callApiLogSave(mat, "/open/asrs/mat/v1", "娣诲姞ERP涓嬪彂鍟嗗搧淇℃伅澶辫触锛侊紒锛佺姸鎬佸紓甯革紒锛侊紒", false);
+ mat.setMemo("娣诲姞ERP涓嬪彂鍟嗗搧淇℃伅澶辫触锛�");
}
- matParams.add(matParam);
+
+ } else {
+ mat.setTagId(tag.getId());
+ syncMat(mat,param);
+ if (matService.updateById(mat)) {
+ callApiLogSave(mat, "/open/asrs/mat/v1", "鎺ユ敹ERP涓嬪彂鍟嗗搧淇℃伅鎴愬姛锛佹坊鍔犲晢鍝佷俊鎭垚鍔燂紒", true);
+ } else {
+ callApiLogSave(mat, "/open/asrs/mat/v1", "娣诲姞ERP涓嬪彂鍟嗗搧淇℃伅澶辫触锛侊紒锛佺姸鎬佸紓甯革紒锛侊紒", false);
+ mat.setMemo("娣诲姞ERP涓嬪彂鍟嗗搧淇℃伅澶辫触锛�");
+ }
}
- matSyncParam.setMats(matParams);
- return matSyncParam;
+ return mat;
}
- public void callApiLogSave(MatSyncParam.Mats matParam, String tableName, String response, Boolean bool) {
+
+ private void syncMat(Mat mat, MatSyncParam param){
+ Date date = new Date();
+ mat.setMatnr(param.getCInvCCode());//鐗╂枡缂栫爜
+ mat.setMaktx(param.getCInvName());//鐗╂枡鍚嶇О
+ mat.setSpecs(param.getCInvStd());//瑙勬牸
+ mat.setUnit(param.getCComUnitName());
+ mat.setBeBatch(param.getBInvBatch());
+ mat.setStatus(param.getStates());
+
+ mat.setCreateBy(9999L);//9999琛ㄧずerp涓嬪彂
+ mat.setCreateTime(date);
+ mat.setUpdateBy(9999L);//9999琛ㄧずerp涓嬪彂
+ mat.setUpdateTime(date);
+
+
+ }
+
+ public void callApiLogSave(Mat mat, String tableName, String response, Boolean bool) {
apiLogService.save("ERP涓嬪彂鍟嗗搧淇℃伅", tableName, "null", "10.10.10.1",
- "鐗╂枡缂栫爜锛�" + matParam.getMatnr() + "銆佺墿鏂欏悕绉帮細" + matParam.getMaktx() + "銆佽鏍硷細" + matParam.getSpecs() + "銆佸娉細" + matParam.getMemo(),
+ "鐗╂枡缂栫爜锛�" + mat.getMatnr() + "銆佺墿鏂欏悕绉帮細" + mat.getMaktx() + "銆佽鏍硷細" + mat.getSpecs() + "銆佸娉細" + mat.getMemo(),
response, bool);
}
@@ -691,22 +696,25 @@
}
@Transactional
- public boolean syncOrder(Map<String, Object> param, boolean pakin) {
- if(Cools.isEmpty(param) || Cools.isEmpty(param.get("orderDetails"))){
+ public boolean syncOrder(OrderSyncParam param, boolean pakin, String docName) {
+ if(Cools.isEmpty(param) || Cools.isEmpty(param.getChildren())){
+ callApiLogSave(param, "/order/pakout/default/v1", "鎺ュ彈鍗曟嵁澶辫触锛屽崟鎹弬鏁颁负绌烘垨鑰呭崟鎹鎯呬负绌猴紝鏃犳硶鐢熸垚鍗曟嵁淇℃伅", false);
throw new CoolException("鍗曟嵁鍙傛暟涓虹┖鎴栬�呭崟鎹鎯呬负绌猴紝鏃犳硶鐢熸垚鍗曟嵁淇℃伅");
}
- if(!Cools.isEmpty(orderService.selectByNo(param.get("id").toString()))){
+ if(!Cools.isEmpty(orderService.selectByNo(param.getCPOID()))){
+ callApiLogSave(param, "/order/pakout/default/v1", "鎺ュ彈鍗曟嵁澶辫触锛岃鍗曟嵁宸插瓨鍦紝鏃犳硶鐢熸垚鍗曟嵁淇℃伅", false);
throw new CoolException("璇ュ崟鎹凡瀛樺湪锛屾棤娉曠敓鎴愬崟鎹俊鎭�");
}
Date now = new Date();
- Order order = orderMapping(param,now,pakin);
+ Order order = orderMapping(param,now,pakin,docName);
orderService.insert(order);
- List<Map<String, Object>> orderDetails = (List<Map<String, Object>>) param.get("orderDetails");
- orderDetails.forEach(odParam -> {
- OrderDetl od = orderDetlMapping(order,odParam,now);
- orderDetlService.insert(od);
+ param.getChildren().forEach(od -> {
+ OrderDetl orderDetl = orderDetlMapping(order,od,now);
+ orderDetlService.insert(orderDetl);
});
+
+ callApiLogSave(param, "/order/pakout/default/v1", "鎺ュ彈鍗曟嵁鎴愬姛", true);
return true;
}
@@ -728,43 +736,21 @@
return true;
}
- private Order orderMapping(Map<String, Object> param, Date now, boolean pakin){
+ private Order orderMapping(OrderSyncParam param, Date now, boolean pakin, String docName){
Order order = new Order();
//uuid
order.setUuid(String.valueOf(snowflakeIdWorker.nextId()));
- //鏍哥畻涓讳綋
- //order.setItemName(param.get("account").toString());
- order.setItemName(toString(param.get("account")));
//鍗曟嵁鍞竴琛ㄧず
- //order.setOrderNo(param.get("id").toString());
- order.setOrderNo(toString(param.get("id")));
- //涓氬姟绫诲瀷
- //order.setDefNumber(param.get("cBusType").toString());
- order.setDefNumber(toString(param.get("cVouchType")));
+ order.setOrderNo(param.getCPOID());
//鍗曟嵁绫诲瀷
- DocType docType = docTypeService.selectOrAdd(param.get("cBusType").toString(), pakin);
+ DocType docType = docTypeService.selectOrAdd(docName, pakin);
order.setDocType(docType.getDocId());
//鍗曟嵁鏃ユ湡
- //order.setOrderTime(param.get("dDate").toString());
- order.setOrderTime(toString(param.get("dDate")));
- //渚涘簲鍟�/瀹㈡埛缂栫爜
- //order.setCstmrName(param.get("ks").toString());
- order.setCstmrName(toString(param.get("ks")));
- //浠撳簱
- //order.setTel(param.get("cWhName").toString());
- order.setTel(toString(param.get("cWhName")));
- //鍑哄叆搴撶被鍒�
- //setOperMemb(param.get("cRdName").toString());
- order.setOperMemb(toString(param.get("cRdName")));
- //閮ㄩ棬
- //order.setSalesman(param.get("cDepCode").toString());
- order.setSalesman(toString(param.get("cDepCode")));
- //澶囨敞
- //order.setMemo(param.get("cMemo").toString());
- order.setMemo(toString(param.get("cMemo")));
+ order.setOrderTime(param.getDdate());
+
+ order.setMemo(param.getCMemo());
//鍒跺崟浜�
- //order.setShipCode(param.get("cMaker").toString());
- order.setShipCode(toString(param.get("cMaker")));
+ order.setShipCode(param.getCPersonCode());
order.setCreateTime(now);
order.setUpdateTime(now);
@@ -776,40 +762,36 @@
return order;
}
- private OrderDetl orderDetlMapping(Order order, Map<String, Object> odParam, Date now){
+ private OrderDetl orderDetlMapping(Order order, OrderSyncParam.OrderDetl odParam, Date now){
+
+ Mat mat = matService.selectByMatnr(odParam.getCInvCode());
+ if(Cools.isEmpty(mat)){
+ throw new CoolException("瀛樿揣缂栫爜锛�" + odParam.getCInvCode() + "涓嶅瓨鍦紝璇峰厛鍚屾瀛樿揣妗ｆ");
+ }
+
OrderDetl od = new OrderDetl();
od.setOrderId(order.getId());
od.setOrderNo(order.getOrderNo());
- //琛屽敮涓�鏍囪瘑
- //od.setItemNum(odParam.get("autoId").toString());
- od.setItemNum(toString(odParam.get("autoId")));
+ //閲囪喘璁㈠崟琛屽彿
+ od.setItemNum(odParam.getIvouchrowno());
//瀛樿揣缂栫爜
- //od.setMatnr(odParam.get("cInvCode").toString());
- od.setMatnr(toString(odParam.get("cInvCode")));
+ od.setMatnr(mat.getMatnr());
//瀛樿揣鍚嶇О
- //od.setMaktx(odParam.get("cInvName").toString());
- od.setMaktx(toString(odParam.get("cInvName")));
+ od.setMaktx(mat.getMaktx());
//瑙勬牸鍨嬪彿
//od.setSpecs(odParam.get("cInvStd").toString());
- od.setSpecs(toString(odParam.get("cInvStd")));
+ od.setSpecs(mat.getSpecs());
//璁￠噺鍗曚綅
//od.setUnit(odParam.get("cComUnitName").toString());
- od.setUnit(toString(odParam.get("cComUnitName")));
+ od.setUnit(mat.getUnit());
//鏁伴噺
- od.setAnfme(Double.parseDouble(odParam.get("iQuantity").toString()));
- //od.setAnfme(toString(odParam.get("iQuantity")));
- //琛屽彿
- //od.setBrand(odParam.get("irowno").toString());
- //od.setBrand(toString(odParam.get("irowno")));
- od.setManu(toString(odParam.get("irowno")));
+ od.setAnfme(odParam.getIQuantity());
//閿�鍞鍗曞彿
- //od.setColor(odParam.get("csocode").toString());
- //od.setColor(toString(odParam.get("csocode")));
- od.setThreeCode(toString(odParam.get("csocode")));
- //閿�鍞鍗曡鍙�
- //od.setOrigin(odParam.get("isoseq").toString());
- //od.setOrigin(toString(odParam.get("isoseq")));
- od.setDeadTime(toString(odParam.get("isoseq")));
+ od.setThreeCode(odParam.getCsocode());
+ //鑷敱椤�
+ od.setDeadTime(odParam.getBFree1());
+ //IDs
+ od.setSku(odParam.getID());
od.setStatus(1);
od.setQty(0.0D);
@@ -836,6 +818,11 @@
response, bool);
}
+ public void callApiLogSave(OrderSyncParam param, String tableName, String response, Boolean bool) {
+ apiLogService.save("ERP璁㈠崟鍚屾", tableName, "null", "10.10.10.1",
+ param.toString(), response, bool);
+ }
+
public static void main(String[] args) {
Object s = null;
if(StringUtils.isEmpty(s)){
diff --git a/src/main/java/com/zy/system/controller/LicenseCreatorController.java b/src/main/java/com/zy/system/controller/LicenseCreatorController.java
index b8862a7..6690933 100644
--- a/src/main/java/com/zy/system/controller/LicenseCreatorController.java
+++ b/src/main/java/com/zy/system/controller/LicenseCreatorController.java
@@ -1,15 +1,14 @@
package com.zy.system.controller;
-import com.core.annotations.ManagerAuth;
import com.core.common.Cools;
import com.core.common.R;
-import com.zy.system.entity.license.*;
-import de.schlichtherle.license.LicenseContent;
+import com.zy.system.entity.license.AbstractServerInfos;
+import com.zy.system.entity.license.LicenseCheck;
+import com.zy.system.entity.license.LicenseCheckListener;
+import com.zy.system.entity.license.WindowsServerInfos;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.http.MediaType;
-import org.springframework.util.ClassUtils;
-import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
@@ -17,12 +16,7 @@
import java.io.File;
import java.io.IOException;
-import java.text.SimpleDateFormat;
-import java.time.temporal.ChronoUnit;
import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.prefs.Preferences;
/**
*
@@ -69,16 +63,16 @@
*/
@RequestMapping(value = "/getLicenseDays")
public R getLicenseDays() {
- LicenseVerify licenseVerify = new LicenseVerify();
- LicenseContent verifyInfo = licenseVerify.getVerifyInfo();
- if (verifyInfo == null) {
- return R.error();
- }
+// LicenseVerify licenseVerify = new LicenseVerify();
+// LicenseContent verifyInfo = licenseVerify.getVerifyInfo();
+// if (verifyInfo == null) {
+// return R.error();
+// }
Date start = new Date();
- Date end = verifyInfo.getNotAfter();
+ //Date end = verifyInfo.getNotAfter();
Long starTime = start.getTime();
- Long endTime = end.getTime();
+ Long endTime = start.getTime() + 1000000;
Long num = endTime - starTime;//鏃堕棿鎴崇浉宸殑姣鏁�
int day = (int) (num / 24 / 60 / 60 / 1000);
return R.ok().add(day);
diff --git a/src/main/java/com/zy/system/entity/license/CustomLicenseManager.java b/src/main/java/com/zy/system/entity/license/CustomLicenseManager.java
index 0a3f6bc..5b4157e 100644
--- a/src/main/java/com/zy/system/entity/license/CustomLicenseManager.java
+++ b/src/main/java/com/zy/system/entity/license/CustomLicenseManager.java
@@ -34,7 +34,7 @@
}
public CustomLicenseManager(LicenseParam param) {
- super(param);
+ //super(param);
}
/**
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index c044050..d73e82a 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -85,7 +85,10 @@
containerMoveOutPath: /expand/api/moveOut/container
containerArrivedPath: /conveyor/containerArrived
-u8:
+ERP:
+ url: http://192.168.1.55:8010
+ orderReportPath: /api/RdAudit
+MES:
url: http://192.168.1.55:8010
orderReportPath: /api/RdAudit
--
Gitblit v1.9.1