From 8c7fbc6b870b91eba276c4e95b4f6a7a917eec14 Mon Sep 17 00:00:00 2001 From: luxiaotao1123 <t1341870251@163.com> Date: 星期四, 01 四月 2021 10:38:57 +0800 Subject: [PATCH] # --- src/main/java/zy/cloud/wms/manager/entity/CustOrder.java | 16 +++++++ src/main/resources/mapper/CustOrderMapper.xml | 1 src/main/java/zy/cloud/wms/common/service/erp/entity/GetOrderResult0.java | 2 src/main/java/zy/cloud/wms/common/service/erp/ErpScheduler.java | 16 +++++-- src/main/java/zy/cloud/wms/common/service/erp/entity/UploadBill.java | 3 + src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java | 29 +++++++------- src/main/java/zy/cloud/wms/common/service/erp/entity/UploadBillDetail.java | 3 + src/main/resources/application.yml | 4 +- 8 files changed, 51 insertions(+), 23 deletions(-) diff --git a/src/main/java/zy/cloud/wms/common/service/erp/ErpScheduler.java b/src/main/java/zy/cloud/wms/common/service/erp/ErpScheduler.java index f49210e..c1e19f6 100644 --- a/src/main/java/zy/cloud/wms/common/service/erp/ErpScheduler.java +++ b/src/main/java/zy/cloud/wms/common/service/erp/ErpScheduler.java @@ -294,6 +294,7 @@ List<GetOrderResult0> list = JSON.parseArray(result.getData(), GetOrderResult0.class); if (!Cools.isEmpty(list)) { boolean complete = true; + Set<String> existNumbers = new HashSet<>(); for (GetOrderResult0 data : list) { if (custOrderService.selectCount(new EntityWrapper<CustOrder>() .eq("number", data.getNumber()) @@ -301,6 +302,7 @@ ) > 0) { // log.error("{}鍗曞彿宸插瓨鍦�", data.getNumber()); // complete = false; + existNumbers.add(data.getNumber()); continue; } for (GetOrderResultDetl0 detl0 : data.getDetail()) { @@ -309,6 +311,7 @@ data.getBillDate(), // 鍗曟嵁鏃ユ湡[闈炵┖] data.getBTypeID(), // 瀹㈡埛缂栧彿 data.getETypeID(), // 缁忔墜浜虹紪鍙穂闈炵┖] + data.getVchcode(), // 鍗曟嵁鑷ID detl0.getUserCode(), // 鍟嗗搧缂栧彿 detl0.getQty(), // 鍟嗗搧鏁伴噺 detl0.getQty(), // 鎬绘暟閲� @@ -320,8 +323,7 @@ now, // 淇敼鏃堕棿 data.getSummary() // 澶囨敞 ); - boolean insert = custOrderService.insert(custOrder); - if (!insert) { + if (!custOrderService.insert(custOrder)) { complete = false; log.error("淇濆瓨閿�鍞鍗曞け璐ワ紒"); } @@ -330,7 +332,9 @@ if (complete) { List<String> collect = list.stream().map(GetOrderResult0::getNumber).distinct().collect(Collectors.toList()); for (String number : collect) { - custOrderService.updateStatus(number, 1); + if (!existNumbers.contains(number)) { + custOrderService.updateStatus(number, 1); + } } } @@ -346,12 +350,12 @@ /** * 瀹屾垚閿�鍞鍗� */ -// @Scheduled(cron = "0/10 * * * * ? ") + @Scheduled(cron = "0/10 * * * * ? ") @Transactional // @PostConstruct public void finishOrdersExecute(){ try { - List<CustOrder> custOrders = custOrderService.selectList(new EntityWrapper<CustOrder>().eq("status", 4)); + List<CustOrder> custOrders = custOrderService.selectList(new EntityWrapper<CustOrder>().eq("status", 4).isNotNull("vch_code")); if (!Cools.isEmpty(custOrders)) { List<String> numbers = custOrders.stream().map(CustOrder::getNumber).distinct().collect(Collectors.toList()); for (String number : numbers) { @@ -370,6 +374,7 @@ getOrderResult0.setBillDate(custOrder.getBillDate()); getOrderResult0.setBTypeID(custOrder.getBTypeId()); getOrderResult0.setKTypeID("瀹忔尯浠撳簱"); + getOrderResult0.setVchcode(custOrder.getVchcode()); } // 琛ㄤ綋 GetOrderResultDetl0 detl0 = new GetOrderResultDetl0(); @@ -377,6 +382,7 @@ detl0.setQty(custOrder.getTotal()); detl0.setPrice(custOrder.getPrice()); detl0.setComment(custOrder.getComment()); + detl0.setRowNo(custOrder.getRowNo()); list.add(detl0); iterator.remove(); } diff --git a/src/main/java/zy/cloud/wms/common/service/erp/entity/GetOrderResult0.java b/src/main/java/zy/cloud/wms/common/service/erp/entity/GetOrderResult0.java index d93540c..d2924e6 100644 --- a/src/main/java/zy/cloud/wms/common/service/erp/entity/GetOrderResult0.java +++ b/src/main/java/zy/cloud/wms/common/service/erp/entity/GetOrderResult0.java @@ -14,7 +14,7 @@ private String number; // 鑷 - private String Vchcode; + private Double Vchcode; private Integer vchType; diff --git a/src/main/java/zy/cloud/wms/common/service/erp/entity/UploadBill.java b/src/main/java/zy/cloud/wms/common/service/erp/entity/UploadBill.java index 57a3cc5..b1e92cc 100644 --- a/src/main/java/zy/cloud/wms/common/service/erp/entity/UploadBill.java +++ b/src/main/java/zy/cloud/wms/common/service/erp/entity/UploadBill.java @@ -22,6 +22,9 @@ private String summary; + // 鑷 + private Double Vchcode; + private List<UploadBillDetail> detail; } diff --git a/src/main/java/zy/cloud/wms/common/service/erp/entity/UploadBillDetail.java b/src/main/java/zy/cloud/wms/common/service/erp/entity/UploadBillDetail.java index 3fec515..7696840 100644 --- a/src/main/java/zy/cloud/wms/common/service/erp/entity/UploadBillDetail.java +++ b/src/main/java/zy/cloud/wms/common/service/erp/entity/UploadBillDetail.java @@ -16,4 +16,7 @@ private String comment; + // 鍟嗗搧鏄庣粏琛屽彿 + private Double RowNo; + } diff --git a/src/main/java/zy/cloud/wms/manager/entity/CustOrder.java b/src/main/java/zy/cloud/wms/manager/entity/CustOrder.java index 18c3f19..6777442 100644 --- a/src/main/java/zy/cloud/wms/manager/entity/CustOrder.java +++ b/src/main/java/zy/cloud/wms/manager/entity/CustOrder.java @@ -42,6 +42,13 @@ private String eTypeId; /** + * 鍗曟嵁鑷ID + */ + @ApiModelProperty(value= "鍗曟嵁鑷ID") + @TableField("vch_code") + private Double vchcode; + + /** * 鍟嗗搧缂栧彿 */ @ApiModelProperty(value= "鍟嗗搧缂栧彿") @@ -107,11 +114,12 @@ public CustOrder() {} - public CustOrder(String number,String billDate,String bTypeId,String eTypeId,String userCode,Double qty,Double total,Double price, Double rowNo, String comment,Integer status,Date createTime,Date updateTime,String memo) { + public CustOrder(String number,String billDate,String bTypeId,String eTypeId,Double vchcode,String userCode,Double qty,Double total,Double price, Double rowNo, String comment,Integer status,Date createTime,Date updateTime,String memo) { this.number = number; this.billDate = billDate; this.bTypeId = bTypeId; this.eTypeId = eTypeId; + this.vchcode = vchcode; this.userCode = userCode; this.qty = qty; this.total = total; @@ -283,5 +291,11 @@ this.memo = memo; } + public Double getVchcode() { + return vchcode; + } + public void setVchcode(Double vchcode) { + this.vchcode = vchcode; + } } diff --git a/src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java b/src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java index 1f205a8..6c071b1 100644 --- a/src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java +++ b/src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java @@ -255,20 +255,20 @@ } // 閲囪喘閫�璐у崟 // if (param.getNumber().startsWith("PR-")) { - // erp鍗曟嵁涓婁紶 - Long docId = pakouts.get(0).getDocId(); - if (null != docId) { - List<BillDto> dtos = new ArrayList<>(); - for (Pakout pakout : pakouts) { - BillDto billDto = new BillDto(); - billDto.setMatnr(pakout.getMatnr()); - billDto.setQty(pakout.getAnfme()); - dtos.add(billDto); - } - if (!erpService.uploadBill(dtos, docId.intValue() , pakouts.get(0).getDocNum())) { - throw new CoolException("鏃犳硶涓婃姤鑷砮rp"); - } - } + // erp鍗曟嵁涓婁紶 todo +// Long docId = pakouts.get(0).getDocId(); +// if (null != docId) { +// List<BillDto> dtos = new ArrayList<>(); +// for (Pakout pakout : pakouts) { +// BillDto billDto = new BillDto(); +// billDto.setMatnr(pakout.getMatnr()); +// billDto.setQty(pakout.getAnfme()); +// dtos.add(billDto); +// } +// if (!erpService.uploadBill(dtos, docId.intValue() , pakouts.get(0).getDocNum())) { +// throw new CoolException("鏃犳硶涓婃姤鑷砮rp"); +// } +// } // } return R.ok(); @@ -411,6 +411,7 @@ DateUtils.convert(now), // 鍗曟嵁鏃ユ湡[闈炵┖] param.getCustomerTypeId(), // 瀹㈡埛缂栧彿 null, // 缁忔墜浜虹紪鍙穂绌篯 + null, dto.getMatnr(), // 鍟嗗搧缂栧彿 dto.getCount(), // 鍟嗗搧鏁伴噺 dto.getCount(), // 鎬绘暟閲� diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 8686aa2..c306db6 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -14,7 +14,7 @@ # password: xltys1995 # sql-server driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver - url: jdbc:sqlserver://192.168.2.250:1433;databasename=htasrs + url: jdbc:sqlserver://192.168.110.56:1433;databasename=htasrs username: sa password: sa@123 mvc: @@ -53,4 +53,4 @@ endpoint: http://oss-cn-hangzhou.aliyuncs.com asrs: - baseUrl: http://localhost:8081/htwms \ No newline at end of file + baseUrl: http://192.168.110.56:8080/htwms \ No newline at end of file diff --git a/src/main/resources/mapper/CustOrderMapper.xml b/src/main/resources/mapper/CustOrderMapper.xml index 76922f1..352b9bb 100644 --- a/src/main/resources/mapper/CustOrderMapper.xml +++ b/src/main/resources/mapper/CustOrderMapper.xml @@ -8,6 +8,7 @@ <result column="bill_date" property="billDate" /> <result column="bType_id" property="bTypeId" /> <result column="eType_id" property="eTypeId" /> + <result column="vch_code" property="vchcode" /> <result column="user_code" property="userCode" /> <result column="qty" property="qty" /> <result column="total" property="total" /> -- Gitblit v1.9.1