From 666181924a7deee3cc2b927949cac6b6d88a41c9 Mon Sep 17 00:00:00 2001
From: ZY <zc857179121@qq.com>
Date: 星期四, 18 七月 2024 17:09:58 +0800
Subject: [PATCH] 中间表代码提交
---
src/main/java/com/zy/third/erp/entity/ItemTB.java | 15
src/main/java/com/zy/third/lk/entity/OutHedTBBak.java | 16
src/main/java/com/zy/asrs/mapper/LocDetlMapper.java | 7
src/main/webapp/views/locDetlStatis/locDetlStatis.html | 35 +
src/main/resources/mapper/LocDetlMapper.xml | 43 ++
src/main/java/com/zy/third/lk/entity/OutHedTB.java | 14
src/main/java/com/zy/asrs/entity/DocType.java | 7
src/main/java/com/zy/third/lk/entity/OutDetTBBak.java | 20
src/main/java/com/zy/asrs/entity/Mat.java | 33 +
src/main/java/com/zy/asrs/entity/WrkDetl.java | 27 +
src/main/java/com/zy/asrs/entity/WrkDetlLog.java | 27 +
src/main/java/com/zy/asrs/entity/OrderDetl.java | 31 +
src/main/java/com/zy/asrs/service/LocDetlService.java | 3
src/main/java/com/zy/asrs/controller/LocDetlController.java | 10
src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java | 9
src/main/java/com/zy/third/erp/task/ERPItemScheduler.java | 7
version/lib/framework-3.4.0.jar | 0
src/main/java/com/zy/third/erp/task/ERPInCancelSchedulerMS.java | 55 ++
src/main/java/com/zy/third/erp/task/ERPInOrOutTBSchedulerMS.java | 147 +++++++
src/main/java/com/zy/third/lk/task/LKInTBScheduler.java | 240 ++++++++++++
src/main/java/com/zy/third/erp/task/ERPItemSchedulerMS.java | 12
/dev/null | 84 ----
src/main/java/com/zy/third/erp/task/ERPOutHedTBScheduler.java | 74 +++
src/main/java/com/zy/asrs/entity/LocDetl.java | 28 +
src/main/java/com/zy/asrs/entity/StockStatisDTO.java | 16
src/main/java/com/zy/third/erp/task/ERPInCancelScheduler.java | 47 ++
src/main/java/com/zy/third/lk/entity/InHedTB.java | 2
src/main/java/com/zy/third/erp/task/ERPInHedTBScheduler.java | 74 +++
src/main/java/com/zy/third/lk/entity/OutDetTB.java | 18
29 files changed, 942 insertions(+), 159 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LocDetlController.java b/src/main/java/com/zy/asrs/controller/LocDetlController.java
index 6eba1f6..a202a28 100644
--- a/src/main/java/com/zy/asrs/controller/LocDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/LocDetlController.java
@@ -15,6 +15,7 @@
import com.zy.asrs.entity.LocDetl;
import com.zy.asrs.entity.ManLocDetl;
import com.zy.asrs.entity.Mat;
+import com.zy.asrs.entity.StockStatisDTO;
import com.zy.asrs.mapper.LocDetlMapper;
import com.zy.asrs.service.LocDetlService;
import com.zy.asrs.service.ManLocDetlService;
@@ -232,13 +233,8 @@
public R statis(@RequestParam(defaultValue = "1")Integer curr,
@RequestParam(defaultValue = "10")Integer limit,
@RequestParam Map<String, Object> param) {
- Page<LocDetl> stockStatis = locDetlService.getStockStatis(toPage(curr, limit, param, LocDetl.class));
- for (LocDetl locDetl : stockStatis.getRecords()) {
- Mat mat = matService.selectByMatnr(locDetl.getMatnr());
- if (mat != null) {
- locDetl.sync(mat);
- }
- }
+ System.out.println(JSONObject.toJSON(param));
+ Page<StockStatisDTO> stockStatis = locDetlService.getStockStatis(toPage(curr, limit, param, StockStatisDTO.class));
return R.ok().add(stockStatis);
}
diff --git a/src/main/java/com/zy/asrs/entity/DocType.java b/src/main/java/com/zy/asrs/entity/DocType.java
index 3cd4c70..69560b0 100644
--- a/src/main/java/com/zy/asrs/entity/DocType.java
+++ b/src/main/java/com/zy/asrs/entity/DocType.java
@@ -38,6 +38,13 @@
private String docName;
/**
+ * 绫诲瀷缂栫爜
+ */
+ @ApiModelProperty(value= "绫诲瀷缂栫爜")
+ @TableField("doc_code")
+ private String docCode;
+
+ /**
* 鍏ュ簱 1: 鍏ュ簱 0: 闈炲叆搴�
*/
@ApiModelProperty(value= "鍏ュ簱 1: 鍏ュ簱 0: 闈炲叆搴� ")
diff --git a/src/main/java/com/zy/asrs/entity/LocDetl.java b/src/main/java/com/zy/asrs/entity/LocDetl.java
index 1a68af5..73febfb 100644
--- a/src/main/java/com/zy/asrs/entity/LocDetl.java
+++ b/src/main/java/com/zy/asrs/entity/LocDetl.java
@@ -158,6 +158,34 @@
@ApiModelProperty(value= "澶囨敞")
private String memo;
+
+ /**
+ * 璁㈠崟鍙�
+ */
+ @TableField("out_order_no")
+ private String outOrderNo;
+
+ /**
+ * 鐐夊彿\瀹㈡埛鍥惧彿
+ */
+ @TableField("lu_hao")
+ private String luHao;
+
+ /**
+ * 宸ュ崟鍙�
+ */
+ @TableField("pg_no")
+ private String sPgNO;
+
+
+ private String temp1;
+
+
+ private String temp2;
+
+ private String temp3;
+
+
public String getLocNo$(){
LocMastService service = SpringUtils.getBean(LocMastService.class);
LocMast locMast = service.selectById(this.locNo);
diff --git a/src/main/java/com/zy/asrs/entity/Mat.java b/src/main/java/com/zy/asrs/entity/Mat.java
index bee0346..989e678 100644
--- a/src/main/java/com/zy/asrs/entity/Mat.java
+++ b/src/main/java/com/zy/asrs/entity/Mat.java
@@ -325,6 +325,39 @@
@TableField("store_max_date")
private Integer storeMaxDate;
+ /**
+ * 澶栭儴涓婚敭
+ */
+ @TableField("auto_id")
+ private Integer autoId;
+ /**
+ * 璁㈠崟鍙�
+ */
+ @TableField("out_order_no")
+ private String outOrderNo;
+
+ /**
+ * 鐐夊彿\瀹㈡埛鍥惧彿
+ */
+ @TableField("lu_hao")
+ private String luHao;
+
+ /**
+ * 宸ュ崟鍙�
+ */
+ @TableField("pg_no")
+ private String sPgNO;
+
+
+ private String temp1;
+
+
+ private String temp2;
+
+ private String temp3;
+
+
+
public Mat() {}
public Mat(String uuid,Long tagId,String matnr,String maktx,String name,String specs,String model,String color,String brand,String unit,Double price,String sku,Double units,String barcode,String origin,String manu,String manuDate,String itemNum,Double safeQty,Double weight,Double length,Double volume,String threeCode,String supp,String suppCode,Integer beBatch,String deadTime,Integer deadWarn,Integer source,Integer inspect,Integer danger,Integer status,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
diff --git a/src/main/java/com/zy/asrs/entity/OrderDetl.java b/src/main/java/com/zy/asrs/entity/OrderDetl.java
index f08621d..82f80de 100644
--- a/src/main/java/com/zy/asrs/entity/OrderDetl.java
+++ b/src/main/java/com/zy/asrs/entity/OrderDetl.java
@@ -295,6 +295,37 @@
@ApiModelProperty(value= "澶囨敞")
private String memo;
+
+
+ /**
+ * 澶栭儴涓婚敭
+ */
+ @TableField("auto_id")
+ private Integer autoId;
+
+ @TableField("out_order_no")
+ private String outOrderNo;
+ /**
+ * 鐐夊彿\瀹㈡埛鍥惧彿
+ */
+ @TableField("lu_hao")
+ private String luHao;
+
+ /**
+ * 宸ュ崟鍙�
+ */
+ @TableField("pg_no")
+ private String sPgNO;
+
+
+ private String temp1;
+
+
+ private String temp2;
+
+ private String temp3;
+
+
public OrderDetl() {}
public OrderDetl(Long orderId, String orderNo, Double anfme, Double qty, String matnr, String maktx, String batch, String specs, String model, String color, String brand, String unit, Double price, String sku, Double units, String barcode, String origin, String manu, String manuDate, String itemNum, Double safeQty, Double weight, Double length, Double volume, String threeCode, String supp, String suppCode, Integer beBatch, String deadTime, Integer deadWarn, Integer source, Integer inspect, Integer danger, Integer status, Long createBy, Date createTime, Long updateBy, Date updateTime, String memo) {
diff --git a/src/main/java/com/zy/asrs/entity/StockStatisDTO.java b/src/main/java/com/zy/asrs/entity/StockStatisDTO.java
new file mode 100644
index 0000000..32d597d
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/StockStatisDTO.java
@@ -0,0 +1,16 @@
+package com.zy.asrs.entity;
+
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@NoArgsConstructor
+public class StockStatisDTO {
+ private String matnr;
+ private String maktx;
+ private String itemCode;
+ private int lkQty;
+ private int erpQty;
+ private String itemBatch;
+ private String specs;
+}
diff --git a/src/main/java/com/zy/asrs/entity/WrkDetl.java b/src/main/java/com/zy/asrs/entity/WrkDetl.java
index 349a127..939004d 100644
--- a/src/main/java/com/zy/asrs/entity/WrkDetl.java
+++ b/src/main/java/com/zy/asrs/entity/WrkDetl.java
@@ -269,6 +269,33 @@
@ApiModelProperty(value= "澶囨敞")
private String memo;
+ /**
+ * 璁㈠崟鍙�
+ */
+ @TableField("out_order_no")
+ private String outOrderNo;
+
+ /**
+ * 鐐夊彿\瀹㈡埛鍥惧彿
+ */
+ @TableField("lu_hao")
+ private String luHao;
+
+ /**
+ * 宸ュ崟鍙�
+ */
+ @TableField("pg_no")
+ private String sPgNO;
+
+
+ private String temp1;
+
+
+ private String temp2;
+
+ private String temp3;
+
+
public String getIoTime$(){
if (Cools.isEmpty(this.ioTime)){
return "";
diff --git a/src/main/java/com/zy/asrs/entity/WrkDetlLog.java b/src/main/java/com/zy/asrs/entity/WrkDetlLog.java
index 0383b98..3ae409b 100644
--- a/src/main/java/com/zy/asrs/entity/WrkDetlLog.java
+++ b/src/main/java/com/zy/asrs/entity/WrkDetlLog.java
@@ -268,6 +268,33 @@
@ApiModelProperty(value= "澶囨敞")
private String memo;
+ /**
+ * 璁㈠崟鍙�
+ */
+ @TableField("out_order_no")
+ private String outOrderNo;
+
+ /**
+ * 鐐夊彿\瀹㈡埛鍥惧彿
+ */
+ @TableField("lu_hao")
+ private String luHao;
+
+ /**
+ * 宸ュ崟鍙�
+ */
+ @TableField("pg_no")
+ private String sPgNO;
+
+
+ private String temp1;
+
+
+ private String temp2;
+
+ private String temp3;
+
+
public String getIoTime$(){
if (Cools.isEmpty(this.ioTime)){
return "";
diff --git a/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java b/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
index 2b7255c..43f37e5 100644
--- a/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.mapper.BaseMapper;
import com.zy.asrs.entity.LocDetl;
+import com.zy.asrs.entity.StockStatisDTO;
import com.zy.asrs.entity.result.StockVo;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@@ -78,4 +79,10 @@
List<LocDetl> selectLocDetlUnilateralMoveShuttleY(@Param("matnr")String matnr,@Param("batch")String batch,@Param("grade")String grade);
List<LocDetl> selectLocDetlUnilateralMoveShuttleN(@Param("matnr")String matnr,@Param("batch")String batch,@Param("grade")String grade);
+
+
+
+ List<StockStatisDTO> asrsAndErpList(Map<String, Object> condition);
+
+ long asrsAndErpCount(Map<String, Object> condition);
}
diff --git a/src/main/java/com/zy/asrs/service/LocDetlService.java b/src/main/java/com/zy/asrs/service/LocDetlService.java
index b08fe2a..4665c70 100644
--- a/src/main/java/com/zy/asrs/service/LocDetlService.java
+++ b/src/main/java/com/zy/asrs/service/LocDetlService.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.plugins.Page;
import com.baomidou.mybatisplus.service.IService;
import com.zy.asrs.entity.LocDetl;
+import com.zy.asrs.entity.StockStatisDTO;
import com.zy.asrs.entity.result.StockVo;
import java.util.List;
@@ -39,7 +40,7 @@
*/
List<String> getSameDetlToday(String matnr, String batch, Integer start, Integer end);
- Page<LocDetl> getStockStatis(Page<LocDetl> page);
+ Page<StockStatisDTO> getStockStatis(Page<StockStatisDTO> page);
Double getSumAnfme(String matnr);
diff --git a/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
index 2a882be..130ed88 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
@@ -1,8 +1,10 @@
package com.zy.asrs.service.impl;
+import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.plugins.Page;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.zy.asrs.entity.LocDetl;
+import com.zy.asrs.entity.StockStatisDTO;
import com.zy.asrs.entity.result.StockVo;
import com.zy.asrs.mapper.LocDetlMapper;
import com.zy.asrs.service.LocDetlService;
@@ -56,9 +58,10 @@
@Override
- public Page<LocDetl> getStockStatis(Page<LocDetl> page) {
- page.setRecords(baseMapper.getStockStatis(page.getCondition()));
- page.setTotal(baseMapper.getStockStatisCount(page.getCondition()));
+ public Page<StockStatisDTO> getStockStatis(Page<StockStatisDTO> page) {
+ System.out.println(JSONObject.toJSON(page));
+ page.setRecords(baseMapper.asrsAndErpList(page.getCondition()));
+ page.setTotal(baseMapper.asrsAndErpCount(page.getCondition()));
return page;
}
diff --git a/src/main/java/com/zy/third/erp/entity/InCancelTBBak.java b/src/main/java/com/zy/third/erp/entity/InCancelTBBak.java
deleted file mode 100644
index 94887bc..0000000
--- a/src/main/java/com/zy/third/erp/entity/InCancelTBBak.java
+++ /dev/null
@@ -1,84 +0,0 @@
-package com.zy.third.erp.entity;
-
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.core.common.Cools;import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiModelProperty;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.enums.IdType;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import org.springframework.format.annotation.DateTimeFormat;
-import io.swagger.annotations.ApiModelProperty;
-
-import com.baomidou.mybatisplus.annotations.TableName;
-import java.io.Serializable;
-
-@Data
-@NoArgsConstructor
-@TableName("erp_InCancelTB_bak")
-public class InCancelTBBak implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- @TableId(value = "AutoId",type = IdType.AUTO)
- @TableField(value = "AutoId")
- @ApiModelProperty(value= "")
- private Integer AutoId;
-
- @ApiModelProperty(value= "")
- @TableId(value = "BillNo", type = IdType.INPUT)
- @TableField("BillNo")
- private String BillNo;
-
- @ApiModelProperty(value= "")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- @TableField("MakeDate")
- private Date MakeDate;
-
-
- @ApiModelProperty(value= "")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- @TableField("Remark")
- private Date DelDate;
-
- @ApiModelProperty(value= "")
- @TableField("LKName")
- private String LKName;
-
-// InCancelTBBak inCancelTBBak = new InCancelTBBak(
-// null, // [闈炵┖]
-// null, //
-// null //
-// );
-
-
-
- public String getBillNo() {
- return BillNo;
- }
-
- public void setBillNo(String BillNo) {
- this.BillNo = BillNo;
- }
-
- public Date getMakeDate() {
- return MakeDate;
- }
-
- public String getMakeDate$(){
- if (Cools.isEmpty(this.MakeDate)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.MakeDate);
- }
-
- public void setMakeDate(Date MakeDate) {
- this.MakeDate = MakeDate;
- }
-
-
-
-}
diff --git a/src/main/java/com/zy/third/erp/entity/InDetTBBak.java b/src/main/java/com/zy/third/erp/entity/InDetTBBak.java
deleted file mode 100644
index 1f8e33d..0000000
--- a/src/main/java/com/zy/third/erp/entity/InDetTBBak.java
+++ /dev/null
@@ -1,258 +0,0 @@
-package com.zy.third.erp.entity;
-
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.core.common.Cools;import io.swagger.annotations.ApiModelProperty;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.enums.IdType;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiModelProperty;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import org.springframework.format.annotation.DateTimeFormat;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiModelProperty;
-
-import com.baomidou.mybatisplus.annotations.TableName;
-import java.io.Serializable;
-
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-@TableName("erp_InDetTB_bak")
-public class InDetTBBak implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- @TableField("AutoId")
- private Integer autoId;
-
-
- @ApiModelProperty(value= "")
- @TableField("BillNo")
- private String BillNo;
-
- @ApiModelProperty(value= "")
-
- @TableField("iNo")
- private Integer iNO;
-
- /**
- * erp琛屽敮涓�鐮�
- */
- @ApiModelProperty(value= "erp琛屽敮涓�鐮�")
- @TableField("DetId")
- private Integer detId;
-
- @ApiModelProperty(value= "")
- @TableField("ItemId")
- private String itemid;
-
- @ApiModelProperty(value= "")
- @TableField("ItemCode")
- private String ItemCode;
-
- @ApiModelProperty(value= "")
- @TableField("ItemBatch")
- private String ItemBatch;
-
- @ApiModelProperty(value= "")
- @TableField("proType")
- private String protype;
-
- @ApiModelProperty(value= "")
- @TableField("OrderNo")
- private String OrderNo;
-
- @ApiModelProperty(value= "")
- @TableField("MainNum")
- private Double MainNum;
-
- @ApiModelProperty(value= "")
- @TableField("remark")
- private String remark;
-
- @TableField("WareId")
- private String wareId;
-
- @TableField("WareName")
- private String WareName;
-
- @ApiModelProperty(value= "")
- @TableField("temp1")
- private String temp1;
-
- @ApiModelProperty(value= "")
- @TableField("temp2")
- private String temp2;
-
- @ApiModelProperty(value= "")
- @TableField("temp3")
- private String temp3;
-
- @ApiModelProperty(value= "")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- @TableField("MakeDate")
- private Date makedate;
-
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- @TableField("DelDate")
- private Date delDate;
-
- @ApiModelProperty(value= "")
- @TableField("LKName")
- private String LKName;
-
-
-
-
-
-// InDetTBBak inDetTBBak = new InDetTBBak(
-// null, // [闈炵┖]
-// null, // [闈炵┖]
-// null, // erp琛屽敮涓�鐮乕闈炵┖]
-// null, //
-// null, //
-// null, //
-// null, //
-// null, //
-// null, //
-// null, //
-// null, //
-// null, //
-// null, //
-// null //
-// );
-
- public String getBillNo() {
- return BillNo;
- }
-
- public void setBillNo(String BillNo) {
- this.BillNo = BillNo;
- }
-
- public Integer getINO() {
- return iNO;
- }
-
- public void setINO(Integer iNO) {
- this.iNO = iNO;
- }
-
- public Integer getDetId() {
- return detId;
- }
-
- public void setDetId(Integer detId) {
- this.detId = detId;
- }
-
- public String getItemid() {
- return itemid;
- }
-
- public void setItemid(String itemid) {
- this.itemid = itemid;
- }
-
- public String getItemCode() {
- return ItemCode;
- }
-
- public void setItemCode(String ItemCode) {
- this.ItemCode = ItemCode;
- }
-
- public String getItemBatch() {
- return ItemBatch;
- }
-
- public void setItemBatch(String ItemBatch) {
- this.ItemBatch = ItemBatch;
- }
-
- public String getProtype() {
- return protype;
- }
-
- public void setProtype(String protype) {
- this.protype = protype;
- }
-
- public Double getMainNum() {
- return MainNum;
- }
-
- public void setMainNum(Double MainNum) {
- this.MainNum = MainNum;
- }
-
- public String getOrderNo() {
- return OrderNo;
- }
-
- public void setOrderNo(String OrderNo) {
- this.OrderNo = OrderNo;
- }
-
- public Date getMakedate() {
- return makedate;
- }
-
- public String getMakedate$(){
- if (Cools.isEmpty(this.makedate)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.makedate);
- }
-
- public void setMakedate(Date makedate) {
- this.makedate = makedate;
- }
-
- public String getRemark() {
- return remark;
- }
-
- public void setRemark(String remark) {
- this.remark = remark;
- }
-
- public String getTemp1() {
- return temp1;
- }
-
- public void setTemp1(String temp1) {
- this.temp1 = temp1;
- }
-
- public String getTemp2() {
- return temp2;
- }
-
- public void setTemp2(String temp2) {
- this.temp2 = temp2;
- }
-
- public String getTemp3() {
- return temp3;
- }
-
- public void setTemp3(String temp3) {
- this.temp3 = temp3;
- }
-
-
-}
diff --git a/src/main/java/com/zy/third/erp/entity/InHedTBBak.java b/src/main/java/com/zy/third/erp/entity/InHedTBBak.java
deleted file mode 100644
index 0078b61..0000000
--- a/src/main/java/com/zy/third/erp/entity/InHedTBBak.java
+++ /dev/null
@@ -1,212 +0,0 @@
-package com.zy.third.erp.entity;
-
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.core.common.Cools;import io.swagger.annotations.ApiModelProperty;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.enums.IdType;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiModelProperty;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import io.swagger.annotations.ApiModelProperty;
-import org.springframework.format.annotation.DateTimeFormat;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiModelProperty;
-
-import com.baomidou.mybatisplus.annotations.TableName;
-import java.io.Serializable;
-
-@TableName("erp_InHedTB_bak")
-public class InHedTBBak implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- @TableId(value = "AutoId", type = IdType.AUTO)
- private Integer autoId;
-
- @ApiModelProperty(value= "")
- @TableField("BillNo")
- private String BillNo;
-
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- @TableField("BillDate")
- private Date billDate;
-
- /**
- * StockIn:閲囪喘鍏ュ簱
-ProductIn:鎴愬搧鍏ュ簱鍗�
-ItemMoveIn:璋冩嫧鍏ュ簱
-ItemSwitchIn:褰㈡�佽浆鎹㈠叆搴�
-CheckMoreIn:鐩樼泩鍏ュ簱鍗�
-
- */
-
- @TableField("IoKindID")
- private String IoKindID;
-
- @TableField("IoKindName")
- private String ioKindName;
-
- /**
- * 渚涘簲鍟嗐�侀儴闂↖D
- */
- @ApiModelProperty(value= "渚涘簲鍟嗐�侀儴闂↖D")
- @TableField("ObjectId")
- private String OjectId;
-
- /**
- * 渚涘簲鍟嗐�侀儴闂ㄥ悕绉�
- */
- @ApiModelProperty(value= "渚涘簲鍟嗐�侀儴闂ㄥ悕绉�")
- @TableField("ObjectName")
- private String OjbectName;
-
- @ApiModelProperty(value= "")
- @TableField("Remark")
- private String remark;
-
- @TableField("WareId")
- private String wareId;
-
- @TableField("WareName")
- private String wareName;
-
- @ApiModelProperty(value= "")
- @TableField("Temp1")
- private String Temp1;
-
- @ApiModelProperty(value= "")
- @TableField("Temp2")
- private String Temp2;
-
- @ApiModelProperty(value= "")
- @TableField("Temp3")
- private String Temp3;
-
-
- @ApiModelProperty(value= "")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- @TableField("MakeDate")
- private Date makedate;
-
-
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- @TableField("DelDate")
- private Date delDate;
-
- @ApiModelProperty(value= "")
- @TableField("LKName")
- private String LKName;
-
- public InHedTBBak() {}
-
- public InHedTBBak(String BillNo,String IoKindID,String OjectId,String OjbectName,Date makedate,String remark,String Temp1,String Temp2,String Temp3) {
- this.BillNo = BillNo;
- this.IoKindID = IoKindID;
- this.OjectId = OjectId;
- this.OjbectName = OjbectName;
- this.makedate = makedate;
- this.remark = remark;
- this.Temp1 = Temp1;
- this.Temp2 = Temp2;
- this.Temp3 = Temp3;
- }
-
-// InHedTBBak inHedTBBak = new InHedTBBak(
-// null, // [闈炵┖]
-// null, // StockIn:閲囪喘鍏ュ簱
-
-
-// null, // 渚涘簲鍟嗐�侀儴闂↖D
-// null, // 渚涘簲鍟嗐�侀儴闂ㄥ悕绉�
-// null, //
-// null, //
-// null, //
-// null, //
-// null //
-// );
-
- public String getBillNo() {
- return BillNo;
- }
-
- public void setBillNo(String BillNo) {
- this.BillNo = BillNo;
- }
-
- public String getIoKindID() {
- return IoKindID;
- }
-
- public void setIoKindID(String IoKindID) {
- this.IoKindID = IoKindID;
- }
-
- public String getOjectId() {
- return OjectId;
- }
-
- public void setOjectId(String OjectId) {
- this.OjectId = OjectId;
- }
-
- public String getOjbectName() {
- return OjbectName;
- }
-
- public void setOjbectName(String OjbectName) {
- this.OjbectName = OjbectName;
- }
-
- public Date getMakedate() {
- return makedate;
- }
-
- public String getMakedate$(){
- if (Cools.isEmpty(this.makedate)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.makedate);
- }
-
- public void setMakedate(Date makedate) {
- this.makedate = makedate;
- }
-
- public String getRemark() {
- return remark;
- }
-
- public void setRemark(String remark) {
- this.remark = remark;
- }
-
- public String getTemp1() {
- return Temp1;
- }
-
- public void setTemp1(String Temp1) {
- this.Temp1 = Temp1;
- }
-
- public String getTemp2() {
- return Temp2;
- }
-
- public void setTemp2(String Temp2) {
- this.Temp2 = Temp2;
- }
-
- public String getTemp3() {
- return Temp3;
- }
-
- public void setTemp3(String Temp3) {
- this.Temp3 = Temp3;
- }
-
-
-}
diff --git a/src/main/java/com/zy/third/erp/entity/ItemTB.java b/src/main/java/com/zy/third/erp/entity/ItemTB.java
index b66982e..cc0518a 100644
--- a/src/main/java/com/zy/third/erp/entity/ItemTB.java
+++ b/src/main/java/com/zy/third/erp/entity/ItemTB.java
@@ -88,8 +88,23 @@
@ApiModelProperty(value= "")
@TableField("LKName")
private String LKName;
+ /**
+ * 璁㈠崟鍙�
+ */
+ @TableField("order_no")
+ private String orderNo;
+ /**
+ * 鐐夊彿\瀹㈡埛鍥惧彿
+ */
+ @TableField("lu_hao")
+ private String luHao;
+ /**
+ * 宸ュ崟鍙�
+ */
+ @TableField("pg_no")
+ private String sPgNO;
// ItemTB itemTB = new ItemTB(
// null, // [闈炵┖]
diff --git a/src/main/java/com/zy/third/erp/entity/ItemTBBak.java b/src/main/java/com/zy/third/erp/entity/ItemTBBak.java
deleted file mode 100644
index 4226fb9..0000000
--- a/src/main/java/com/zy/third/erp/entity/ItemTBBak.java
+++ /dev/null
@@ -1,228 +0,0 @@
-package com.zy.third.erp.entity;
-
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.core.common.Cools;import io.swagger.annotations.ApiModelProperty;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.enums.IdType;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiModelProperty;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import org.springframework.format.annotation.DateTimeFormat;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiModelProperty;
-
-import com.baomidou.mybatisplus.annotations.TableName;
-import java.io.Serializable;
-
-@Data
-@NoArgsConstructor
-@TableName("erp_ItemTB_bak")
-public class ItemTBBak implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- @TableId(value = "AutoId",type = IdType.AUTO)
- private Integer autoId;
-
- @TableField("ItemId")
- private String ItemID;
-
- @ApiModelProperty(value= "")
- @TableField("ItemCode")
- private String ItemCode;
-
- @ApiModelProperty(value= "")
- @TableField("ItemName")
- private String ItemName;
-
- @ApiModelProperty(value= "")
- @TableField("ItemSpc")
- private String ItemSpc;
-
- @TableField("ItemPic")
- private String itemPic;
-
- @ApiModelProperty(value= "")
- @TableField("ItemUnit")
- private String ItemUnit;
-
- /**
- * 姣涘澂銆佸崐鎴愬搧銆佹垚鍝�
- */
- @TableField("ItemKind")
- @ApiModelProperty(value= "姣涘澂銆佸崐鎴愬搧銆佹垚鍝�")
- private String ItemKind;
-
- @ApiModelProperty(value= "")
- @TableField("Remark")
- private String remark;
-
- /**
- * 00锛氭柊澧� 22锛氬垹闄�
- */
- @ApiModelProperty(value= "00锛氭柊澧� 22锛氬垹闄�")
- @TableField("Flag")
- private String flag;
-
- @ApiModelProperty(value= "")
- @TableField("Temp1")
- private String temp1;
-
- @ApiModelProperty(value= "")
- @TableField("Temp2")
- private String temp2;
-
- @ApiModelProperty(value= "")
- @TableField("Temp3")
- private String temp3;
-
-
- @ApiModelProperty(value= "")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- @TableField("MakeDate")
- private Date makedate;
-
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- @TableField("DelDate")
- private Date delDate;
-
- @ApiModelProperty(value= "")
- @TableField("LKName")
- private String LKName;
-
-// ItemTBBak itemTBBak = new ItemTBBak(
-// null, // [闈炵┖]
-// null, // [闈炵┖]
-// null, // [闈炵┖]
-// null, //
-// null, // [闈炵┖]
-// null, // 姣涘澂銆佸崐鎴愬搧銆佹垚鍝�
-// null, //
-// null, // 00锛氭柊澧� 22锛氬垹闄�
-// null, //
-// null, //
-// null, //
-// null, //
-// null, //
-// null //
-// );
-
- public String getItemID() {
- return ItemID;
- }
-
- public void setItemID(String ItemID) {
- this.ItemID = ItemID;
- }
-
- public String getItemCode() {
- return ItemCode;
- }
-
- public void setItemCode(String ItemCode) {
- this.ItemCode = ItemCode;
- }
-
- public String getItemName() {
- return ItemName;
- }
-
- public void setItemName(String ItemName) {
- this.ItemName = ItemName;
- }
-
- public String getItemSpc() {
- return ItemSpc;
- }
-
- public void setItemSpc(String ItemSpc) {
- this.ItemSpc = ItemSpc;
- }
-
- public String getItemUnit() {
- return ItemUnit;
- }
-
- public void setItemUnit(String ItemUnit) {
- this.ItemUnit = ItemUnit;
- }
-
- public String getItemKind() {
- return ItemKind;
- }
-
- public void setItemKind(String ItemKind) {
- this.ItemKind = ItemKind;
- }
-
- public String getRemark() {
- return remark;
- }
-
- public void setRemark(String remark) {
- this.remark = remark;
- }
-
- public String getFlag() {
- return flag;
- }
-
- public void setFlag(String flag) {
- this.flag = flag;
- }
-
- public Date getMakedate() {
- return makedate;
- }
-
- public String getMakedate$(){
- if (Cools.isEmpty(this.makedate)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.makedate);
- }
-
- public void setMakedate(Date makedate) {
- this.makedate = makedate;
- }
-
- public String getTemp1() {
- return temp1;
- }
-
- public void setTemp1(String temp1) {
- this.temp1 = temp1;
- }
-
- public String getTemp2() {
- return temp2;
- }
-
- public void setTemp2(String temp2) {
- this.temp2 = temp2;
- }
-
- public String getTemp3() {
- return temp3;
- }
-
- public void setTemp3(String temp3) {
- this.temp3 = temp3;
- }
-
-
-
-
-}
diff --git a/src/main/java/com/zy/third/erp/entity/OutCancelTB.java b/src/main/java/com/zy/third/erp/entity/OutCancelTB.java
deleted file mode 100644
index 1623305..0000000
--- a/src/main/java/com/zy/third/erp/entity/OutCancelTB.java
+++ /dev/null
@@ -1,73 +0,0 @@
-package com.zy.third.erp.entity;
-
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.core.common.Cools;import io.swagger.annotations.ApiModelProperty;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.enums.IdType;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import io.swagger.annotations.ApiModelProperty;
-import org.springframework.format.annotation.DateTimeFormat;
-import io.swagger.annotations.ApiModelProperty;
-
-import com.baomidou.mybatisplus.annotations.TableName;
-import java.io.Serializable;
-
-@TableName("erp_OutCancelTB")
-public class OutCancelTB implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- @TableId(value = "AutoId", type = IdType.AUTO)
- private Integer autoId;
-
- @ApiModelProperty(value= "")
- @TableField("BillNo")
- private String BillNo;
-
- @ApiModelProperty(value= "")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- @TableField("MakeDate")
- private Date makedate;
-
- @ApiModelProperty(value= "")
- @TableField("LKName")
- private String LKName;
-
- public OutCancelTB() {}
-
-
-
-// OutCancelTB outCancelTB = new OutCancelTB(
-// null, // [闈炵┖]
-// null, //
-// null //
-// );
-
- public String getBillNo() {
- return BillNo;
- }
-
- public void setBillNo(String BillNo) {
- this.BillNo = BillNo;
- }
-
- public Date getMakedate() {
- return makedate;
- }
-
- public String getMakedate$(){
- if (Cools.isEmpty(this.makedate)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.makedate);
- }
-
- public void setMakedate(Date makedate) {
- this.makedate = makedate;
- }
-
-
-
-
-}
diff --git a/src/main/java/com/zy/third/erp/entity/OutCancelTBBak.java b/src/main/java/com/zy/third/erp/entity/OutCancelTBBak.java
deleted file mode 100644
index c9345cf..0000000
--- a/src/main/java/com/zy/third/erp/entity/OutCancelTBBak.java
+++ /dev/null
@@ -1,88 +0,0 @@
-package com.zy.third.erp.entity;
-
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.core.common.Cools;import io.swagger.annotations.ApiModelProperty;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.enums.IdType;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import io.swagger.annotations.ApiModelProperty;
-import org.springframework.format.annotation.DateTimeFormat;
-import io.swagger.annotations.ApiModelProperty;
-
-import com.baomidou.mybatisplus.annotations.TableName;
-import java.io.Serializable;
-
-@TableName("erp_OutCancelTB_bak")
-public class OutCancelTBBak implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- @TableId(value = "AutoId", type = IdType.AUTO)
- private Integer autoId;
-
- @ApiModelProperty(value= "")
- @TableField("BillNo")
- private String BillNo;
-
- @ApiModelProperty(value= "")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- @TableField("MakeDate")
- private Date makedate;
-
- @ApiModelProperty(value= "")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- @TableField("DelDate")
- private String DelDate;
-
- @ApiModelProperty(value= "")
- @TableField("LKName")
- private String LKName;
-
- public OutCancelTBBak() {}
-
- public OutCancelTBBak(String BillNo,Date makedate,String DelDate) {
- this.BillNo = BillNo;
- this.makedate = makedate;
- this.DelDate = DelDate;
- }
-
-// OutCancelTBBak outCancelTBBak = new OutCancelTBBak(
-// null, // [闈炵┖]
-// null, //
-// null //
-// );
-
- public String getBillNo() {
- return BillNo;
- }
-
- public void setBillNo(String BillNo) {
- this.BillNo = BillNo;
- }
-
- public Date getMakedate() {
- return makedate;
- }
-
- public String getMakedate$(){
- if (Cools.isEmpty(this.makedate)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.makedate);
- }
-
- public void setMakedate(Date makedate) {
- this.makedate = makedate;
- }
-
- public String getDelDate() {
- return DelDate;
- }
-
- public void setDelDate(String DelDate) {
- this.DelDate = DelDate;
- }
-
-
-}
diff --git a/src/main/java/com/zy/third/erp/entity/OutDetTb.java b/src/main/java/com/zy/third/erp/entity/OutDetTb.java
deleted file mode 100644
index bd121a6..0000000
--- a/src/main/java/com/zy/third/erp/entity/OutDetTb.java
+++ /dev/null
@@ -1,253 +0,0 @@
-package com.zy.third.erp.entity;
-
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.core.common.Cools;import io.swagger.annotations.ApiModelProperty;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.enums.IdType;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiModelProperty;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import org.springframework.format.annotation.DateTimeFormat;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiModelProperty;
-
-import com.baomidou.mybatisplus.annotations.TableName;
-import java.io.Serializable;
-
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-@TableName("erp_OutDetTb")
-public class OutDetTb implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- @TableId(value = "AutoId",type = IdType.AUTO)
- private Integer autoId;
-
- @ApiModelProperty(value= "")
- @TableField("BillNo")
- private String BillNo;
-
- @ApiModelProperty(value= "")
- @TableField("iNo")
- private Integer iNO;
-
- @ApiModelProperty(value= "")
- @TableField("DetId")
- private Integer detId;
-
- @ApiModelProperty(value= "")
- @TableField("ItemId")
- private String itemid;
-
- @ApiModelProperty(value= "")
- @TableField("ItemCode")
- private String ItemCode;
-
- @ApiModelProperty(value= "")
- @TableField("ItemBatch")
- private String itembatch;
-
- @ApiModelProperty(value= "")
- @TableField("proType")
- private String protype;
-
- @ApiModelProperty(value= "")
- @TableField("OrderNo")
- private String OrderNo;
-
- @ApiModelProperty(value= "")
- @TableField("MainNum")
- private Double MainNum;
-
- @TableField("remark")
- private String remark;
-
- @TableField("WareId")
- private String wareId;
-
- @TableField("WareName")
- private String wareName;
-
- @ApiModelProperty(value= "")
- private String temp1;
-
- @ApiModelProperty(value= "")
- private String temp2;
-
- @ApiModelProperty(value= "")
- private String temp3;
-
- @ApiModelProperty(value= "")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- @TableField("MakeDate")
- private Date makedate;
-
-// @ApiModelProperty(value= "")
-// @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-// @TableField("DelDate")
-// private Date delDate;
-
- @ApiModelProperty(value= "")
- @TableField("LKName")
- private String LKName;
-
-
-
-
-// OutDetTb outDetTb = new OutDetTb(
-// null, // [闈炵┖]
-// null, // [闈炵┖]
-// null, // [闈炵┖]
-// null, // [闈炵┖]
-// null, //
-// null, //
-// null, //
-// null, // [闈炵┖]
-// null, //
-// null, //
-// null, //
-// null, //
-// null, //
-// null, //
-// null //
-// );
-
- public String getBillNo() {
- return BillNo;
- }
-
- public void setBillNo(String BillNo) {
- this.BillNo = BillNo;
- }
-
- public Integer getINO() {
- return iNO;
- }
-
- public void setINO(Integer iNO) {
- this.iNO = iNO;
- }
-
- public Integer getDetId() {
- return detId;
- }
-
- public void setDetId(Integer detId) {
- this.detId = detId;
- }
-
- public String getItemid() {
- return itemid;
- }
-
- public void setItemid(String itemid) {
- this.itemid = itemid;
- }
-
- public String getItemCode() {
- return ItemCode;
- }
-
- public void setItemCode(String ItemCode) {
- this.ItemCode = ItemCode;
- }
-
- public String getItembatch() {
- return itembatch;
- }
-
- public void setItembatch(String itembatch) {
- this.itembatch = itembatch;
- }
-
- public String getProtype() {
- return protype;
- }
-
- public void setProtype(String protype) {
- this.protype = protype;
- }
-
- public Double getMainNum() {
- return MainNum;
- }
-
- public void setMainNum(Double MainNum) {
- this.MainNum = MainNum;
- }
-
-
-
- public String getOrderNo() {
- return OrderNo;
- }
-
- public void setOrderNo(String OrderNo) {
- this.OrderNo = OrderNo;
- }
-
- public Date getMakedate() {
- return makedate;
- }
-
- public String getMakedate$(){
- if (Cools.isEmpty(this.makedate)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.makedate);
- }
-
- public void setMakedate(Date makedate) {
- this.makedate = makedate;
- }
-
- public String getRemark() {
- return remark;
- }
-
- public void setRemark(String remark) {
- this.remark = remark;
- }
-
- public String getTemp1() {
- return temp1;
- }
-
- public void setTemp1(String temp1) {
- this.temp1 = temp1;
- }
-
- public String getTemp2() {
- return temp2;
- }
-
- public void setTemp2(String temp2) {
- this.temp2 = temp2;
- }
-
- public String getTemp3() {
- return temp3;
- }
-
- public void setTemp3(String temp3) {
- this.temp3 = temp3;
- }
-
-
-}
diff --git a/src/main/java/com/zy/third/erp/entity/OutDetTbBak.java b/src/main/java/com/zy/third/erp/entity/OutDetTbBak.java
deleted file mode 100644
index 7db4295..0000000
--- a/src/main/java/com/zy/third/erp/entity/OutDetTbBak.java
+++ /dev/null
@@ -1,252 +0,0 @@
-package com.zy.third.erp.entity;
-
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.core.common.Cools;import io.swagger.annotations.ApiModelProperty;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.enums.IdType;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiModelProperty;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiModelProperty;
-
-import com.baomidou.mybatisplus.annotations.TableName;
-import java.io.Serializable;
-
-@Data
-@TableName("erp_OutDetTb_bak")
-public class OutDetTbBak implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- @TableId(value = "AutoId",type = IdType.AUTO)
- private Integer autoId;
-
- @ApiModelProperty(value= "")
- @TableField("BillNo")
- private String BillNo;
-
- @ApiModelProperty(value= "")
- @TableField("iNo")
- private Integer iNO;
-
- @ApiModelProperty(value= "")
- @TableField("DetId")
- private Integer detId;
-
- @ApiModelProperty(value= "")
- @TableField("ItemId")
- private String itemid;
-
- @ApiModelProperty(value= "")
- @TableField("ItemCode")
- private String ItemCode;
-
- @ApiModelProperty(value= "")
- @TableField("ItemBatch")
- private String itembatch;
-
- @ApiModelProperty(value= "")
- @TableField("proType")
- private String protype;
-
- @ApiModelProperty(value= "")
- @TableField("OrderNo")
- private String OrderNo;
-
- @ApiModelProperty(value= "")
- @TableField("MainNum")
- private Double MainNum;
-
- @ApiModelProperty(value= "")
- @TableField("remark")
- private String remark;
-
-
- @TableField("WareId")
- private String wareId;
-
- @TableField("WareName")
- private String wareName;
-
- @ApiModelProperty(value= "")
- @TableField("temp1")
- private String temp1;
-
- @ApiModelProperty(value= "")
- @TableField("temp2")
- private String temp2;
-
- @ApiModelProperty(value= "")
- @TableField("temp3")
- private String temp3;
-
-
- @ApiModelProperty(value= "")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- @TableField("MakeDate")
- private Date makedate;
-
- @TableField("DelDate")
- private Date delDate;
-
- @ApiModelProperty(value= "")
- @TableField("LKName")
- private String LKName;
-
-
-
-
-// OutDetTbBak outDetTbBak = new OutDetTbBak(
-// null, // [闈炵┖]
-// null, // [闈炵┖]
-// null, // [闈炵┖]
-// null, // [闈炵┖]
-// null, //
-// null, //
-// null, //
-// null, // [闈炵┖]
-// null, //
-// null, //
-// null, //
-// null, //
-// null, //
-// null, //
-// null //
-// );
-
- public String getBillNo() {
- return BillNo;
- }
-
- public void setBillNo(String BillNo) {
- this.BillNo = BillNo;
- }
-
- public Integer getINO() {
- return iNO;
- }
-
- public void setINO(Integer iNO) {
- this.iNO = iNO;
- }
-
- public Integer getDetId() {
- return detId;
- }
-
- public void setDetId(Integer detId) {
- this.detId = detId;
- }
-
- public String getItemid() {
- return itemid;
- }
-
- public void setItemid(String itemid) {
- this.itemid = itemid;
- }
-
- public String getItemCode() {
- return ItemCode;
- }
-
- public void setItemCode(String ItemCode) {
- this.ItemCode = ItemCode;
- }
-
- public String getItembatch() {
- return itembatch;
- }
-
- public void setItembatch(String itembatch) {
- this.itembatch = itembatch;
- }
-
- public String getProtype() {
- return protype;
- }
-
- public void setProtype(String protype) {
- this.protype = protype;
- }
-
- public Double getMainNum() {
- return MainNum;
- }
-
- public void setMainNum(Double MainNum) {
- this.MainNum = MainNum;
- }
-
-
- public String getOrderNo() {
- return OrderNo;
- }
-
- public void setOrderNo(String OrderNo) {
- this.OrderNo = OrderNo;
- }
-
- public Date getMakedate() {
- return makedate;
- }
-
- public String getMakedate$(){
- if (Cools.isEmpty(this.makedate)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.makedate);
- }
-
- public void setMakedate(Date makedate) {
- this.makedate = makedate;
- }
-
- public String getRemark() {
- return remark;
- }
-
- public void setRemark(String remark) {
- this.remark = remark;
- }
-
- public String getTemp1() {
- return temp1;
- }
-
- public void setTemp1(String temp1) {
- this.temp1 = temp1;
- }
-
- public String getTemp2() {
- return temp2;
- }
-
- public void setTemp2(String temp2) {
- this.temp2 = temp2;
- }
-
- public String getTemp3() {
- return temp3;
- }
-
- public void setTemp3(String temp3) {
- this.temp3 = temp3;
- }
-
-
-}
diff --git a/src/main/java/com/zy/third/erp/entity/OutHedTb.java b/src/main/java/com/zy/third/erp/entity/OutHedTb.java
deleted file mode 100644
index 3a0e141..0000000
--- a/src/main/java/com/zy/third/erp/entity/OutHedTb.java
+++ /dev/null
@@ -1,203 +0,0 @@
-package com.zy.third.erp.entity;
-
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.core.common.Cools;import io.swagger.annotations.ApiModelProperty;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.enums.IdType;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiModelProperty;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import org.springframework.format.annotation.DateTimeFormat;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiModelProperty;
-
-import com.baomidou.mybatisplus.annotations.TableName;
-import java.io.Serializable;
-
-@Data
-@TableName("erp_OutHedTb")
-public class OutHedTb implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- @TableId(value = "AutoId", type = IdType.AUTO)
- private Integer autoId;
-
- @ApiModelProperty(value= "")
- @TableId(value = "BillNo", type = IdType.INPUT)
- @TableField("BillNo")
- private String BillNo;
-
-
- @TableField("BillDate")
-// @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private String billDate;
-
- /**
- * SendMatOut:鍙戞枡鍑哄簱
-OtherOut:鍏跺畠鍑哄簱鍗�
-ItemMoveOut:璋冩嫧鍑哄簱
-ItemSwitchOut:褰㈡�佽浆鎹㈠嚭搴�
-CheckLossOut:鐩樼泩鍑哄簱鍗�
-
- */
- @ApiModelProperty(value= "SendMatOut:鍙戞枡鍑哄簱 ")
- @TableField("IoKindID")
- private String IoKindID;
-
- @TableField("IoKindName")
- private String ioKindName;
-
- /**
- * 閮ㄩ棬ID
- */
- @ApiModelProperty(value= "閮ㄩ棬ID")
- @TableField("ObjectId")
- private String OjectId;
-
- /**
- * 閮ㄩ棬鍚嶇О
- */
- @ApiModelProperty(value= "閮ㄩ棬鍚嶇О")
- @TableField("ObjectName")
- private String OjbectName;
-
- @ApiModelProperty(value= "")
- @TableField("Remark")
- private String remark;
-
- @TableField("WareId")
- private String wareId;
-
- @TableField("WareName")
- private String wareName;
-
- @ApiModelProperty(value= "")
- @TableField("Temp1")
- private String Temp1;
-
- @ApiModelProperty(value= "")
- @TableField("Temp2")
- private String Temp2;
-
- @ApiModelProperty(value= "")
- @TableField("Temp3")
- private String Temp3;
-
-
- @ApiModelProperty(value= "")
-// @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- @TableField("MakeDate")
- private String makedate;
-
- @ApiModelProperty(value= "")
- @TableField("LKName")
- private String LKName;
-
- public OutHedTb(String BillNo) {
- this.BillNo = BillNo;
- }
-
-// OutHedTb outHedTb = new OutHedTb(
-// null, // [闈炵┖]
-// null, // SendMatOut:鍙戞枡鍑哄簱
-
-
-// null, // 閮ㄩ棬ID
-// null, // 閮ㄩ棬鍚嶇О
-// null, //
-// null, //
-// null, //
-// null, //
-// null //
-// );
-
- public String getBillNo() {
- return BillNo;
- }
-
- public void setBillNo(String BillNo) {
- this.BillNo = BillNo;
- }
-
- public String getIoKindID() {
- return IoKindID;
- }
-
- public void setIoKindID(String IoKindID) {
- this.IoKindID = IoKindID;
- }
-
- public String getOjectId() {
- return OjectId;
- }
-
- public void setOjectId(String OjectId) {
- this.OjectId = OjectId;
- }
-
- public String getOjbectName() {
- return OjbectName;
- }
-
- public void setOjbectName(String OjbectName) {
- this.OjbectName = OjbectName;
- }
-
-// public Date getMakedate() {
-// return makedate;
-// }
-//
-// public String getMakedate$(){
-// if (Cools.isEmpty(this.makedate)){
-// return "";
-// }
-// return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.makedate);
-// }
-//
-// public void setMakedate(Date makedate) {
-// this.makedate = makedate;
-// }
-
- public String getRemark() {
- return remark;
- }
-
- public void setRemark(String remark) {
- this.remark = remark;
- }
-
- public String getTemp1() {
- return Temp1;
- }
-
- public void setTemp1(String Temp1) {
- this.Temp1 = Temp1;
- }
-
- public String getTemp2() {
- return Temp2;
- }
-
- public void setTemp2(String Temp2) {
- this.Temp2 = Temp2;
- }
-
- public String getTemp3() {
- return Temp3;
- }
-
- public void setTemp3(String Temp3) {
- this.Temp3 = Temp3;
- }
-
-
-}
diff --git a/src/main/java/com/zy/third/erp/entity/OutHedTbBak.java b/src/main/java/com/zy/third/erp/entity/OutHedTbBak.java
deleted file mode 100644
index 04910e7..0000000
--- a/src/main/java/com/zy/third/erp/entity/OutHedTbBak.java
+++ /dev/null
@@ -1,203 +0,0 @@
-package com.zy.third.erp.entity;
-
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.core.common.Cools;import io.swagger.annotations.ApiModelProperty;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.enums.IdType;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiModelProperty;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import org.springframework.format.annotation.DateTimeFormat;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiModelProperty;
-
-import com.baomidou.mybatisplus.annotations.TableName;
-import java.io.Serializable;
-
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-@TableName("erp_OutHedTb_bak")
-public class OutHedTbBak implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- @TableId(value = "AutoId",type = IdType.AUTO)
- private Integer autoId;
-
- @ApiModelProperty(value= "")
- @TableField("BillNo")
- private String BillNo;
-
- @TableField("BillDate")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date billDate;
-
- /**
- * SendMatOut:鍙戞枡鍑哄簱
-OtherOut:鍏跺畠鍑哄簱鍗�
-ItemMoveOut:璋冩嫧鍑哄簱
-ItemSwitchOut:褰㈡�佽浆鎹㈠嚭搴�
-CheckLossOut:鐩樼泩鍑哄簱鍗�
-
- */
- @ApiModelProperty(value= "SendMatOut:鍙戞枡鍑哄簱 ")
- @TableField("IoKindID")
- private String IoKindID;
-
- @TableField("IoKindName")
- private String ioKindName;
-
- /**
- * 閮ㄩ棬ID
- */
- @ApiModelProperty(value= "閮ㄩ棬ID")
- @TableField("ObjectId")
- private String OjectId;
-
- /**
- * 閮ㄩ棬鍚嶇О
- */
- @ApiModelProperty(value= "閮ㄩ棬鍚嶇О")
- @TableField("ObjectName")
- private String OjbectName;
-
- @ApiModelProperty(value= "")
- @TableField("Remark")
- private String remark;
-
- @TableField("WareId")
- private String wareId;
-
- @TableField("WareName")
- private String wareName;
-
- @ApiModelProperty(value= "")
- @TableField("Temp1")
- private String Temp1;
-
- @ApiModelProperty(value= "")
- @TableField("Temp2")
- private String Temp2;
-
- @ApiModelProperty(value= "")
- @TableField("Temp3")
- private String Temp3;
-
- @ApiModelProperty(value= "")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- @TableField("MakeDate")
- private Date makedate;
-
-
- @TableField("DelDate")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date delDate;
-
- @ApiModelProperty(value= "")
- @TableField("LKName")
- private String LKName;
-
-// OutHedTbBak outHedTbBak = new OutHedTbBak(
-// null, // [闈炵┖]
-// null, // SendMatOut:鍙戞枡鍑哄簱
-
-
-// null, // 閮ㄩ棬ID
-// null, // 閮ㄩ棬鍚嶇О
-// null, //
-// null, //
-// null, //
-// null, //
-// null //
-// );
-
- public String getBillNo() {
- return BillNo;
- }
-
- public void setBillNo(String BillNo) {
- this.BillNo = BillNo;
- }
-
- public String getIoKindID() {
- return IoKindID;
- }
-
- public void setIoKindID(String IoKindID) {
- this.IoKindID = IoKindID;
- }
-
- public String getOjectId() {
- return OjectId;
- }
-
- public void setOjectId(String OjectId) {
- this.OjectId = OjectId;
- }
-
- public String getOjbectName() {
- return OjbectName;
- }
-
- public void setOjbectName(String OjbectName) {
- this.OjbectName = OjbectName;
- }
-
- public Date getMakedate() {
- return makedate;
- }
-
- public String getMakedate$(){
- if (Cools.isEmpty(this.makedate)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.makedate);
- }
-
- public void setMakedate(Date makedate) {
- this.makedate = makedate;
- }
-
- public String getRemark() {
- return remark;
- }
-
- public void setRemark(String remark) {
- this.remark = remark;
- }
-
- public String getTemp1() {
- return Temp1;
- }
-
- public void setTemp1(String Temp1) {
- this.Temp1 = Temp1;
- }
-
- public String getTemp2() {
- return Temp2;
- }
-
- public void setTemp2(String Temp2) {
- this.Temp2 = Temp2;
- }
-
- public String getTemp3() {
- return Temp3;
- }
-
- public void setTemp3(String Temp3) {
- this.Temp3 = Temp3;
- }
-
-
-}
diff --git a/src/main/java/com/zy/third/erp/task/ERPInCancelScheduler.java b/src/main/java/com/zy/third/erp/task/ERPInCancelScheduler.java
new file mode 100644
index 0000000..9eeaa26
--- /dev/null
+++ b/src/main/java/com/zy/third/erp/task/ERPInCancelScheduler.java
@@ -0,0 +1,47 @@
+package com.zy.third.erp.task;
+
+import com.zy.common.service.erp.ErpSqlServer;
+import com.zy.third.erp.entity.InCancelTB;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+import java.util.HashMap;
+import java.util.List;
+
+@Slf4j
+@Component
+public class ERPInCancelScheduler {
+ @Value("${erp.enabled}")
+ private Boolean erpEnabled;
+
+
+ @Autowired
+ private ERPInCancelSchedulerMS inMS;
+
+ @Autowired
+ private ErpSqlServer erpSqlServer;
+
+ @Scheduled(cron = "${erp.refreshtime}")
+ public void itemScheduler() {
+ if (!erpEnabled) return;
+ String sqlInCancelTB = "select * from erp_InCancelTB where LKName='涓壃浜屾湡'";
+ List<InCancelTB> ins = erpSqlServer.select(sqlInCancelTB, InCancelTB.class);
+ for (InCancelTB in : ins) {
+ com.zy.third.lk.entity.InCancelTB lkCancel = inMS.tryCancel(in);
+ if (lkCancel != null) {
+ HashMap<String, String> condition = new HashMap<>();
+ condition.put("BillNo", "'" + in.getBillNo() + "'");
+ erpSqlServer.delete(InCancelTB.class, condition);
+ HashMap<String, Object> content = new HashMap<>();
+ content.put("BillNo", "'" + lkCancel.getBillNo() + "'");
+ content.put("opFlag", lkCancel.getOpFlag());
+ erpSqlServer.insert(com.zy.third.lk.entity.InCancelTB.class, content);
+ } else {
+ log.error("灏嗗叆搴撳彇娑堥�氱煡鍗曞啓鍏ュけ璐�");
+ }
+ }
+ }
+}
diff --git a/src/main/java/com/zy/third/erp/task/ERPInCancelSchedulerMS.java b/src/main/java/com/zy/third/erp/task/ERPInCancelSchedulerMS.java
new file mode 100644
index 0000000..fb0c017
--- /dev/null
+++ b/src/main/java/com/zy/third/erp/task/ERPInCancelSchedulerMS.java
@@ -0,0 +1,55 @@
+package com.zy.third.erp.task;
+
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.zy.asrs.entity.Order;
+import com.zy.asrs.service.OrderDetlService;
+import com.zy.asrs.service.OrderService;
+import com.zy.third.erp.entity.InCancelTB;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+import java.util.List;
+
+@Slf4j
+@Component
+public class ERPInCancelSchedulerMS {
+
+ @Autowired
+ private OrderService orderService;
+
+ @Autowired
+ private OrderDetlService orderDetlService;
+
+
+ public com.zy.third.lk.entity.InCancelTB tryCancel(InCancelTB in) {
+ com.zy.third.lk.entity.InCancelTB lkCancel = new com.zy.third.lk.entity.InCancelTB();
+
+ List<Order> targets = orderService.selectList(new EntityWrapper<Order>()
+ .eq("bill_no", in.getBillNo()));
+
+ if (targets.size() <= 0) {
+ lkCancel.setBillNo(in.getBillNo());
+ //erp鏂硅姹�,璁㈠崟鎵句笉鍒�,杩斿洖1
+ lkCancel.setOpFlag(1);
+ lkCancel.setMakeDate(new Date());
+ return lkCancel;
+ } else {
+ for (Order target : targets) {
+ if (target.getSettle() > 1L) {
+ lkCancel.setBillNo(in.getBillNo());
+ lkCancel.setOpFlag(2);
+ lkCancel.setMakeDate(new Date());
+ return lkCancel;
+ }
+ }
+ lkCancel.setBillNo(in.getBillNo());
+ lkCancel.setOpFlag(1);
+ lkCancel.setMakeDate(new Date());
+ return lkCancel;
+ }
+
+ }
+}
diff --git a/src/main/java/com/zy/third/erp/task/ERPInHedTBScheduler.java b/src/main/java/com/zy/third/erp/task/ERPInHedTBScheduler.java
new file mode 100644
index 0000000..e8b8a2e
--- /dev/null
+++ b/src/main/java/com/zy/third/erp/task/ERPInHedTBScheduler.java
@@ -0,0 +1,74 @@
+package com.zy.third.erp.task;
+
+import com.zy.common.service.erp.ErpSqlServer;
+import com.zy.third.erp.entity.InDetTB;
+import com.zy.third.erp.entity.InHedTB;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+
+/**
+ * 鍏ュ簱鍗曟嵁
+ */
+@Component
+public class ERPInHedTBScheduler {
+
+ @Value("${erp.enabled}")
+ private Boolean erpEnabled;
+
+
+ @Autowired
+ private ERPInOrOutTBSchedulerMS inMS;
+
+
+ @Autowired
+ private ErpSqlServer erpSqlServer;
+
+ @Scheduled(cron = "${erp.refreshtime}")
+ public void InHedTBScheduler() {
+ if (!erpEnabled) return;
+ String sqlInHed = "select * from erp_InHedTB where LKName='涓壃浜屾湡'";
+ List<InHedTB> inHeds = erpSqlServer.select(sqlInHed, InHedTB.class);
+ if (inHeds.size() > 0) {
+ for (InHedTB inHed : inHeds) {
+ HashMap<String, String> condition = new HashMap<>();
+ condition.put("BillNo", "'" + inHed.getBillNo() + "'");
+ List<InDetTB> inDetTBS = erpSqlServer.selectList(InDetTB.class, condition);
+ HashMap<String, Object> hedAndDet = new HashMap<>();
+ hedAndDet.put("hed", inHed);
+ hedAndDet.put("det", inDetTBS);
+ boolean result = inMS.createOrder(inHed, inDetTBS);
+ if (result) {
+ move(hedAndDet);
+ } else {
+ String sql = "UPDATE erp_InHedTB SET Temp3 = 鈥榝ault鈥� WHERE BillNo = '" + inHed.getBillNo() + "'";
+ erpSqlServer.update(sql);
+ }
+ }
+ }
+ }
+
+ @Transactional
+ public void move(HashMap<String, Object> hedAndDet) {
+ InHedTB hed = (InHedTB) hedAndDet.get("hed");
+ ArrayList<InDetTB> dets = (ArrayList<InDetTB>) hedAndDet.get("det");
+ HashMap<String, String> condition = new HashMap<>();
+ condition.put("BillNo", "'" + hed.getBillNo() + "'");
+ erpSqlServer.delete(InHedTB.class, condition);
+
+ for (InDetTB det : dets) {
+ HashMap<String, String> condition2 = new HashMap<>();
+ condition2.put("BillNo", "'" + det.getBillNo() + "'");
+ condition2.put("iNo", String.valueOf(det.getINO()));
+ erpSqlServer.delete(InDetTB.class, condition2);
+
+ }
+
+ }
+}
diff --git a/src/main/java/com/zy/third/erp/task/ERPInOrOutTBSchedulerMS.java b/src/main/java/com/zy/third/erp/task/ERPInOrOutTBSchedulerMS.java
new file mode 100644
index 0000000..35c657c
--- /dev/null
+++ b/src/main/java/com/zy/third/erp/task/ERPInOrOutTBSchedulerMS.java
@@ -0,0 +1,147 @@
+package com.zy.third.erp.task;
+
+import com.core.common.Cools;
+import com.core.common.DateUtils;
+import com.core.common.SnowflakeIdWorker;
+import com.core.exception.CoolException;
+import com.zy.asrs.entity.DocType;
+import com.zy.asrs.entity.Mat;
+import com.zy.asrs.entity.Order;
+import com.zy.asrs.entity.OrderDetl;
+import com.zy.asrs.service.DocTypeService;
+import com.zy.asrs.service.MatService;
+import com.zy.asrs.service.OrderDetlService;
+import com.zy.asrs.service.OrderService;
+import com.zy.common.model.DetlDto;
+import com.zy.third.erp.entity.InDetTB;
+import com.zy.third.erp.entity.InHedTB;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+@Slf4j
+@Component
+public class ERPInOrOutTBSchedulerMS {
+
+
+ @Autowired
+ private OrderService orderService;
+
+ @Autowired
+ private OrderDetlService orderDetlService;
+
+
+ @Autowired
+ private SnowflakeIdWorker snowflakeIdWorker;
+
+
+ @Autowired
+ private DocTypeService docTypeService;
+
+
+ @Autowired
+ private MatService matService;
+
+
+ /**
+ * @return
+ */
+ @Transactional
+ public boolean createOrder(InHedTB inHedTB, List<InDetTB> inDetTBs) {
+ Order order = orderService.selectByNo(inHedTB.getBillNo());
+ // 濡傛灉鍗曟嵁涓嶅瓨鍦ㄥ垯娣诲姞锛涘鏋滃崟鎹瓨鍦紝浣滀笟涓棤娉曚慨鏀癸紝鍙嶄箣鍒欎慨鏀瑰崟鎹�
+ if (!Cools.isEmpty(order)) {
+ if (order.getSettle() > 1L) {
+ throw new CoolException(inHedTB.getBillNo() + "姝ｅ湪鍑哄簱锛屾棤娉曚慨鏀瑰崟鎹�");
+ }
+ orderService.remove(order.getId());
+ }
+ DocType docType = docTypeService.selectOrAdd(inHedTB.getIoKindID(), Boolean.FALSE);
+ Date now = new Date();
+ // 鍗曟嵁涓绘。
+ order = new Order(
+ String.valueOf(snowflakeIdWorker.nextId()), // 缂栧彿[闈炵┖]
+ inHedTB.getBillNo(), // 璁㈠崟缂栧彿
+ DateUtils.convert(now), // 鍗曟嵁鏃ユ湡
+ docType.getDocId(), // 鍗曟嵁绫诲瀷
+ null, // 椤圭洰缂栧彿
+ null, //
+ null, // 璋冩嫧椤圭洰缂栧彿
+ null, // 鍒濆绁ㄦ嵁鍙�
+ null, // 绁ㄦ嵁鍙�
+ null, // 瀹㈡埛缂栧彿
+ null, // 瀹㈡埛
+ null, // 鑱旂郴鏂瑰紡
+ null, // 鎿嶄綔浜哄憳
+ null, // 鍚堣閲戦
+ null, // 浼樻儬鐜�
+ null, // 浼樻儬閲戦
+ null, // 閿�鍞垨閲囪喘璐圭敤鍚堣
+ null, // 瀹炰粯閲戦
+ null, // 浠樻绫诲瀷
+ null, // 涓氬姟鍛�
+ null, // 缁撶畻澶╂暟
+ null, // 閭垂鏀粯绫诲瀷
+ null, // 閭垂
+ null, // 浠樻鏃堕棿
+ null, // 鍙戣揣鏃堕棿
+ null, // 鐗╂祦鍚嶇О
+ null, // 鐗╂祦鍗曞彿
+ 1L, // 璁㈠崟鐘舵��
+ 1, // 鐘舵��
+ 9527L, // 娣诲姞浜哄憳
+ now, // 娣诲姞鏃堕棿
+ 9527L, // 淇敼浜哄憳
+ now, // 淇敼鏃堕棿
+ null // 澶囨敞
+ );
+ if (!orderService.insert(order)) {
+ throw new CoolException("鐢熸垚鍗曟嵁涓绘。澶辫触锛岃鑱旂郴绠＄悊鍛�");
+ }
+ // 鍗曟嵁鏄庣粏妗�
+ List<DetlDto> list = new ArrayList<>();
+ for (InDetTB detail : inDetTBs) {
+ DetlDto dto = new DetlDto(detail.getBillNo(), detail.getItemBatch(), detail.getMainNum());
+ if (DetlDto.has(list, dto)) {
+ DetlDto detlDto = DetlDto.find(list, dto.getMatnr(), dto.getBatch());
+ assert detlDto != null;
+ detlDto.setAnfme(detlDto.getAnfme() + detail.getMainNum());
+ } else {
+ list.add(dto);
+ }
+ }
+ for (DetlDto detlDto : list) {
+ Mat mat = matService.selectByMatnr(detlDto.getMatnr());
+ if (Cools.isEmpty(mat)) {
+ throw new CoolException(detlDto.getMatnr() + "缂栧彿鍟嗗搧妫�绱㈠け璐ワ紝璇峰厛娣诲姞鍟嗗搧");
+ }
+ OrderDetl orderDetl = new OrderDetl();
+ orderDetl.sync(mat);
+ orderDetl.setBatch(detlDto.getBatch());
+ orderDetl.setAnfme(detlDto.getAnfme());
+ orderDetl.setOrderId(order.getId());
+ orderDetl.setOrderNo(order.getOrderNo());
+ orderDetl.setCreateBy(9527L);
+ orderDetl.setCreateTime(now);
+ orderDetl.setUpdateBy(9527L);
+ orderDetl.setUpdateTime(now);
+ orderDetl.setStatus(1);
+ orderDetl.setQty(0.0D);
+ if (!orderDetlService.insert(orderDetl)) {
+ throw new CoolException("鐢熸垚鍗曟嵁鏄庣粏澶辫触锛岃鑱旂郴绠＄悊鍛�");
+ }
+ }
+ return true;
+ }
+
+}
+
+
+
+
+
diff --git a/src/main/java/com/zy/third/erp/task/ERPItemScheduler.java b/src/main/java/com/zy/third/erp/task/ERPItemScheduler.java
index c9f26a1..2ee50c9 100644
--- a/src/main/java/com/zy/third/erp/task/ERPItemScheduler.java
+++ b/src/main/java/com/zy/third/erp/task/ERPItemScheduler.java
@@ -9,6 +9,9 @@
import java.util.List;
+/**
+ * 鐗╂枡妗ｆ
+ */
@Component
public class ERPItemScheduler {
@Value("${erp.enabled}")
@@ -28,7 +31,7 @@
// List<ItemTB> itemTBS = erpSqlServer.select(selectALL, ItemTB.class);
// List<ItemTB> itemTBS = erpSqlServer.selectAll(ItemTB.class);
- String sqlItemTB = "select * from erp_ItemTB where LKName='涓壃'";
+ String sqlItemTB = "select * from erp_ItemTB where LKName='涓壃浜屾湡'";
List<ItemTB> itemTBS = erpSqlServer.select(sqlItemTB, ItemTB.class);
if (itemTBS != null && itemTBS.size() > 0) {
for (ItemTB itemTB : itemTBS) {
@@ -56,7 +59,7 @@
// BeanUtils.copyProperties(itemTB, itemTBBak);
// itemTBBak.setDelDate(new Date());
// erpItemTBBakMapper.insert(itemTBBak);
- erpSqlServer.update("delete from erp_ItemTB where LKName='涓壃' and ItemId = '" + itemTB.getItemId() + "'");
+ erpSqlServer.update("delete from erp_ItemTB where LKName='涓壃浜屾湡' and ItemId = '" + itemTB.getItemId() + "'");
// erpItemTBMapper.delete(new EntityWrapper<ItemTB>()
// .eq("ItemId",itemTB.getItemID()));
}
diff --git a/src/main/java/com/zy/third/erp/task/ERPItemSchedulerMS.java b/src/main/java/com/zy/third/erp/task/ERPItemSchedulerMS.java
index da9ae64..3f415ef 100644
--- a/src/main/java/com/zy/third/erp/task/ERPItemSchedulerMS.java
+++ b/src/main/java/com/zy/third/erp/task/ERPItemSchedulerMS.java
@@ -98,10 +98,20 @@
}
private Mat sync(Mat mat, ItemTB itemTB) {
+ mat.setThreeCode(itemTB.getItemId());
+ mat.setMatnr(itemTB.getItemCode());
mat.setMaktx(itemTB.getItemName());
- mat.setMatnr(itemTB.getItemId());
mat.setSpecs(itemTB.getItemSpc());
mat.setUnit(itemTB.getItemUnit());
+ mat.setMemo(itemTB.getRemark());
+ mat.setCreateTime(itemTB.getMakeDate());
+ mat.setAutoId(itemTB.getAutoId());
+ mat.setTemp1(itemTB.getTemp1());
+ mat.setTemp2(itemTB.getTemp2());
+ mat.setTemp3(itemTB.getTemp3());
+ mat.setLuHao(itemTB.getLuHao());
+ mat.setSPgNO(itemTB.getSPgNO());
+ mat.setOutOrderNo(itemTB.getOrderNo());
return mat;
}
diff --git a/src/main/java/com/zy/third/erp/task/ERPOutHedTBScheduler.java b/src/main/java/com/zy/third/erp/task/ERPOutHedTBScheduler.java
new file mode 100644
index 0000000..06099e3
--- /dev/null
+++ b/src/main/java/com/zy/third/erp/task/ERPOutHedTBScheduler.java
@@ -0,0 +1,74 @@
+package com.zy.third.erp.task;
+
+import com.zy.common.service.erp.ErpSqlServer;
+import com.zy.third.erp.entity.InDetTB;
+import com.zy.third.erp.entity.InHedTB;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+
+/**
+ * 鍏ュ簱鍗曟嵁
+ */
+@Component
+public class ERPOutHedTBScheduler {
+
+ @Value("${erp.enabled}")
+ private Boolean erpEnabled;
+
+
+ @Autowired
+ private ERPInOrOutTBSchedulerMS inMS;
+
+
+ @Autowired
+ private ErpSqlServer erpSqlServer;
+
+ @Scheduled(cron = "${erp.refreshtime}")
+ public void ItemScheduler() {
+ if (!erpEnabled) return;
+ String sqlInHed = "select * from erp_OutHedTB where LKName='涓壃浜屾湡'";
+ List<InHedTB> inHeds = erpSqlServer.select(sqlInHed, InHedTB.class);
+ if (inHeds.size() > 0) {
+ for (InHedTB inHed : inHeds) {
+ HashMap<String, String> condition = new HashMap<>();
+ condition.put("BillNo", "'" + inHed.getBillNo() + "'");
+ List<InDetTB> inDetTBS = erpSqlServer.selectList(InDetTB.class, condition);
+ HashMap<String, Object> hedAndDet = new HashMap<>();
+ hedAndDet.put("hed", inHed);
+ hedAndDet.put("det", inDetTBS);
+ boolean result = inMS.createOrder(inHed, inDetTBS);
+ if (result) {
+ move(hedAndDet);
+ } else {
+ String sql = "UPDATE erp_OutHedTB SET Temp3 = 鈥榝ault鈥� WHERE BillNo = '" + inHed.getBillNo() + "'";
+ erpSqlServer.update(sql);
+ }
+ }
+ }
+ }
+
+ @Transactional
+ public void move(HashMap<String, Object> hedAndDet) {
+ InHedTB hed = (InHedTB) hedAndDet.get("hed");
+ ArrayList<InDetTB> dets = (ArrayList<InDetTB>) hedAndDet.get("det");
+ HashMap<String, String> condition = new HashMap<>();
+ condition.put("BillNo", "'" + hed.getBillNo() + "'");
+ erpSqlServer.delete(InHedTB.class, condition);
+
+ for (InDetTB det : dets) {
+ HashMap<String, String> condition2 = new HashMap<>();
+ condition2.put("BillNo", "'" + det.getBillNo() + "'");
+ condition2.put("iNo", String.valueOf(det.getINO()));
+ erpSqlServer.delete(InDetTB.class, condition2);
+
+ }
+
+ }
+}
diff --git a/src/main/java/com/zy/third/lk/entity/InDetTBBak.java b/src/main/java/com/zy/third/lk/entity/InDetTBBak.java
deleted file mode 100644
index 34ab6ff..0000000
--- a/src/main/java/com/zy/third/lk/entity/InDetTBBak.java
+++ /dev/null
@@ -1,259 +0,0 @@
-package com.zy.third.lk.entity;
-
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.core.common.Cools;import io.swagger.annotations.ApiModelProperty;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.enums.IdType;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiModelProperty;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import io.swagger.annotations.ApiModelProperty;
-import org.springframework.format.annotation.DateTimeFormat;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiModelProperty;
-
-import com.baomidou.mybatisplus.annotations.TableName;
-import java.io.Serializable;
-
-@TableName("lk_InDetTB_bak")
-public class InDetTBBak implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- @TableId(value = "AutoId",type = IdType.AUTO)
- private Integer autoId;
-
- @ApiModelProperty(value= "")
- @TableField("BillNo")
- private String BillNo;
-
- @ApiModelProperty(value= "")
- @TableField("iNo")
- private Integer iNO;
-
- @ApiModelProperty(value= "")
- @TableField("DetId")
- private Integer detId;
-
- @ApiModelProperty(value= "")
- @TableField("ItemId")
- private String itemid;
-
- @ApiModelProperty(value= "")
- @TableField("ItemCode")
- private String ItemCode;
-
- @ApiModelProperty(value= "")
- @TableField("ItemBatch")
- private String ItemBatch;
-
- @ApiModelProperty(value= "")
- @TableField("proType")
- private String protype;
-
- @ApiModelProperty(value= "")
- @TableField("OrderNo")
- private String OrderNo;
-
- @ApiModelProperty(value= "")
- @TableField("MainNum")
- private Double MainNum;
-
- @ApiModelProperty(value= "")
- @TableField("remark")
- private String remark;
-
- @TableField("WareId")
- private String wareId;
-
- @TableField("WareName")
- private String wareName;
-
- @ApiModelProperty(value= "")
- private String temp1;
-
- @ApiModelProperty(value= "")
- private String temp2;
-
- @ApiModelProperty(value= "")
- private String temp3;
-
-
-
- @ApiModelProperty(value= "")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- @TableField("MakeDate")
- private Date makedate;
-
- @TableField("DelDate")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date DelDate;
-
-
-
- public InDetTBBak() {}
-
- public InDetTBBak(String BillNo,Integer iNO,Integer detId,String itemid,String ItemCode,String ItemBatch,String protype,Double MainNum,String OrderNo,Date makedate,String remark,String temp1,String temp2,String temp3) {
- this.BillNo = BillNo;
- this.iNO = iNO;
- this.detId = detId;
- this.itemid = itemid;
- this.ItemCode = ItemCode;
- this.ItemBatch = ItemBatch;
- this.protype = protype;
- this.MainNum = MainNum;
- this.OrderNo = OrderNo;
- this.makedate = makedate;
- this.remark = remark;
- this.temp1 = temp1;
- this.temp2 = temp2;
- this.temp3 = temp3;
- }
-
-// InDetTBBak inDetTBBak = new InDetTBBak(
-// null, // [闈炵┖]
-// null, // [闈炵┖]
-// null, // [闈炵┖]
-// null, // [闈炵┖]
-// null, //
-// null, //
-// null, //
-// null, // [闈炵┖]
-// null, //
-// null, //
-// null, //
-// null, //
-// null, //
-// null //
-// );
-
- public String getBillNo() {
- return BillNo;
- }
-
- public void setBillNo(String BillNo) {
- this.BillNo = BillNo;
- }
-
- public Integer getINO() {
- return iNO;
- }
-
- public void setINO(Integer iNO) {
- this.iNO = iNO;
- }
-
- public Integer getDetId() {
- return detId;
- }
-
- public void setDetId(Integer detId) {
- this.detId = detId;
- }
-
- public String getItemid() {
- return itemid;
- }
-
- public void setItemid(String itemid) {
- this.itemid = itemid;
- }
-
- public String getItemCode() {
- return ItemCode;
- }
-
- public void setItemCode(String ItemCode) {
- this.ItemCode = ItemCode;
- }
-
- public String getItemBatch() {
- return ItemBatch;
- }
-
- public void setItemBatch(String ItemBatch) {
- this.ItemBatch = ItemBatch;
- }
-
- public String getProtype() {
- return protype;
- }
-
- public void setProtype(String protype) {
- this.protype = protype;
- }
-
- public Double getMainNum() {
- return MainNum;
- }
-
- public void setMainNum(Double MainNum) {
- this.MainNum = MainNum;
- }
-
- public String getOrderNo() {
- return OrderNo;
- }
-
- public void setOrderNo(String OrderNo) {
- this.OrderNo = OrderNo;
- }
-
- public Date getMakedate() {
- return makedate;
- }
-
- public String getMakedate$(){
- if (Cools.isEmpty(this.makedate)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.makedate);
- }
-
- public void setMakedate(Date makedate) {
- this.makedate = makedate;
- }
-
- public String getRemark() {
- return remark;
- }
-
- public void setRemark(String remark) {
- this.remark = remark;
- }
-
- public String getTemp1() {
- return temp1;
- }
-
- public void setTemp1(String temp1) {
- this.temp1 = temp1;
- }
-
- public String getTemp2() {
- return temp2;
- }
-
- public void setTemp2(String temp2) {
- this.temp2 = temp2;
- }
-
- public String getTemp3() {
- return temp3;
- }
-
- public void setTemp3(String temp3) {
- this.temp3 = temp3;
- }
-
-
-}
diff --git a/src/main/java/com/zy/third/lk/entity/InHedTB.java b/src/main/java/com/zy/third/lk/entity/InHedTB.java
index eb20462..c46d034 100644
--- a/src/main/java/com/zy/third/lk/entity/InHedTB.java
+++ b/src/main/java/com/zy/third/lk/entity/InHedTB.java
@@ -44,7 +44,7 @@
/**
* StockIn:閲囪喘鍏ュ簱
-ProductIn:鎴愬搧鍏ュ簱鍗�
+ProductIn:OutHedTB
ItemMoveIn:璋冩嫧鍏ュ簱
ItemSwitchIn:褰㈡�佽浆鎹㈠叆搴�
CheckMoreIn:鐩樼泩鍏ュ簱鍗�
diff --git a/src/main/java/com/zy/third/lk/entity/InHedTBBak.java b/src/main/java/com/zy/third/lk/entity/InHedTBBak.java
deleted file mode 100644
index bb95ed7..0000000
--- a/src/main/java/com/zy/third/lk/entity/InHedTBBak.java
+++ /dev/null
@@ -1,212 +0,0 @@
-package com.zy.third.lk.entity;
-
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.core.common.Cools;import io.swagger.annotations.ApiModelProperty;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.enums.IdType;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiModelProperty;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import io.swagger.annotations.ApiModelProperty;
-import org.springframework.format.annotation.DateTimeFormat;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiModelProperty;
-
-import com.baomidou.mybatisplus.annotations.TableName;
-import java.io.Serializable;
-
-@TableName("lk_InHedTB_bak")
-public class InHedTBBak implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- @TableId(value = "AutoId",type = IdType.AUTO)
- private Integer autoId;
-
- @ApiModelProperty(value= "")
- @TableField("BillNo")
- private String BillNo;
-
- @TableField("BillDate")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date billDate;
-
- /**
- * StockIn:閲囪喘鍏ュ簱
-ProductIn:鎴愬搧鍏ュ簱鍗�
-ItemMoveIn:璋冩嫧鍏ュ簱
-ItemSwitchIn:褰㈡�佽浆鎹㈠叆搴�
-CheckMoreIn:鐩樼泩鍏ュ簱鍗�
-
- */
- @ApiModelProperty(value= "StockIn:閲囪喘鍏ュ簱 ")
- @TableField("IoKindID")
- private String IoKindID;
-
- @TableField("IoKindName")
- private String ioKindName;
-
- /**
- * 渚涘簲鍟嗐�侀儴闂↖D
- */
- @ApiModelProperty(value= "渚涘簲鍟嗐�侀儴闂↖D")
- @TableField("ObjectId")
- private String OjectId;
-
- /**
- * 渚涘簲鍟嗐�侀儴闂ㄥ悕绉�
- */
- @ApiModelProperty(value= "渚涘簲鍟嗐�侀儴闂ㄥ悕绉�")
- @TableField("ObjectName")
- private String OjbectName;
-
- @ApiModelProperty(value= "")
- @TableField("Remark")
- private String remark;
-
- @TableField("WareId")
- private String wareId;
-
- @TableField("WareName")
- private String wareName;
-
- @ApiModelProperty(value= "")
- @TableField("Temp1")
- private String temp1;
-
- @ApiModelProperty(value= "")
- @TableField("Temp2")
- private String temp2;
-
- @ApiModelProperty(value= "")
- @TableField("Temp3")
- private String temp3;
-
- @ApiModelProperty(value= "")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- @TableField("MakeDate")
- private Date makedate;
-
- @TableField("DelDate")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date delDate;
-
-
- @TableField("bPass")
- private Boolean bPass;
-
- @TableField("bStartIn")
- private Boolean bStartIn;
-
- public InHedTBBak() {}
-
- public InHedTBBak(String BillNo,String IoKindID,String OjectId,String OjbectName,Date makedate,String remark,String temp1,String temp2,String temp3) {
- this.BillNo = BillNo;
- this.IoKindID = IoKindID;
- this.OjectId = OjectId;
- this.OjbectName = OjbectName;
- this.makedate = makedate;
- this.remark = remark;
- this.temp1 = temp1;
- this.temp2 = temp2;
- this.temp3 = temp3;
- }
-
-// InHedTBBak inHedTBBak = new InHedTBBak(
-// null, // [闈炵┖]
-// null, // StockIn:閲囪喘鍏ュ簱
-
-// null, // 渚涘簲鍟嗐�侀儴闂↖D
-// null, // 渚涘簲鍟嗐�侀儴闂ㄥ悕绉�
-// null, //
-// null, //
-// null, //
-// null, //
-// null //
-// );
-
- public String getBillNo() {
- return BillNo;
- }
-
- public void setBillNo(String BillNo) {
- this.BillNo = BillNo;
- }
-
- public String getIoKindID() {
- return IoKindID;
- }
-
- public void setIoKindID(String IoKindID) {
- this.IoKindID = IoKindID;
- }
-
- public String getOjectId() {
- return OjectId;
- }
-
- public void setOjectId(String OjectId) {
- this.OjectId = OjectId;
- }
-
- public String getOjbectName() {
- return OjbectName;
- }
-
- public void setOjbectName(String OjbectName) {
- this.OjbectName = OjbectName;
- }
-
- public Date getMakedate() {
- return makedate;
- }
-
- public String getMakedate$(){
- if (Cools.isEmpty(this.makedate)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.makedate);
- }
-
- public void setMakedate(Date makedate) {
- this.makedate = makedate;
- }
-
- public String getRemark() {
- return remark;
- }
-
- public void setRemark(String remark) {
- this.remark = remark;
- }
-
- public String getTemp1() {
- return temp1;
- }
-
- public void setTemp1(String temp1) {
- this.temp1 = temp1;
- }
-
- public String getTemp2() {
- return temp2;
- }
-
- public void setTemp2(String temp2) {
- this.temp2 = temp2;
- }
-
- public String getTemp3() {
- return temp3;
- }
-
- public void setTemp3(String temp3) {
- this.temp3 = temp3;
- }
-
-
-}
diff --git a/src/main/java/com/zy/third/lk/entity/LKCheckDetTB.java b/src/main/java/com/zy/third/lk/entity/LKCheckDetTB.java
deleted file mode 100644
index 674d498..0000000
--- a/src/main/java/com/zy/third/lk/entity/LKCheckDetTB.java
+++ /dev/null
@@ -1,95 +0,0 @@
-package com.zy.third.lk.entity;
-
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.core.common.Cools;import io.swagger.annotations.ApiModelProperty;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.enums.IdType;
-
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
-import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import com.baomidou.mybatisplus.annotations.TableName;
-import java.io.Serializable;
-
-@Data
-@TableName("lk_CheckDetTB")
-public class LKCheckDetTB implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- @ApiModelProperty(value= "")
- @TableId(value = "AutoId", type = IdType.AUTO)
- @TableField("AutoId")
- private Integer AutoId;
-
- @ApiModelProperty(value= "")
- @TableField("BillNo")
- private String BillNo;
-
- @ApiModelProperty(value= "")
- @TableField("iNo")
- private Integer iNo;
-
- @ApiModelProperty(value= "")
- @TableField("ItemId")
- private String ItemId;
-
- @ApiModelProperty(value= "")
- @TableField("ItemCode")
- private String ItemCode;
-
- @ApiModelProperty(value= "")
- @TableField("ItemBatch")
- private String ItemBatch;
-
- @ApiModelProperty(value= "")
- @TableField("proType")
- private String proType;
-
- @ApiModelProperty(value= "")
- @TableField("OrderNo")
- private String OrderNo;
-
- @ApiModelProperty(value= "")
- @TableField("CheckNum")
- private Double CheckNum;
-
- @ApiModelProperty(value= "")
- @TableField("remark")
- private String remark;
-
- @ApiModelProperty(value= "")
- @TableField("temp1")
- private String temp1;
-
- @ApiModelProperty(value= "")
- @TableField("temp2")
- private String temp2;
-
- @ApiModelProperty(value= "")
- @TableField("temp3")
- private String temp3;
-
- @ApiModelProperty(value= "")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- @TableField("MakeDate")
- private Date MakeDate;
-
- public LKCheckDetTB() {}
-
- public String getMakeDate$(){
- if (Cools.isEmpty(this.MakeDate)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.MakeDate);
- }
-
- public void setMakeDate(Date MakeDate) {
- this.MakeDate = MakeDate;
- }
-
-
-}
diff --git a/src/main/java/com/zy/third/lk/entity/LKCheckHedTB.java b/src/main/java/com/zy/third/lk/entity/LKCheckHedTB.java
deleted file mode 100644
index 0791b9b..0000000
--- a/src/main/java/com/zy/third/lk/entity/LKCheckHedTB.java
+++ /dev/null
@@ -1,212 +0,0 @@
-package com.zy.third.lk.entity;
-
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.core.common.Cools;import io.swagger.annotations.ApiModelProperty;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.enums.IdType;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
-import org.springframework.format.annotation.DateTimeFormat;
-
-import com.baomidou.mybatisplus.annotations.TableName;
-import java.io.Serializable;
-
-@TableName("lk_CheckHedTB")
-public class LKCheckHedTB implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- @ApiModelProperty(value= "")
- @TableId(value = "AutoId", type = IdType.AUTO)
- private Integer AutoId;
-
- @ApiModelProperty(value= "")
- @TableId(value = "BillNo", type = IdType.INPUT)
- @TableField("BillNo")
- private String BillNo;
-
- @ApiModelProperty(value= "")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- @TableField("BillDate")
- private Date BillDate;
-
- @ApiModelProperty(value= "")
- @TableField("Remark")
- private String Remark;
-
- @ApiModelProperty(value= "")
- @TableField("WareId")
- private String WareId;
-
- @ApiModelProperty(value= "")
- @TableField("WareName")
- private String WareName;
-
- @ApiModelProperty(value= "")
- @TableField("Temp1")
- private String Temp1;
-
- @ApiModelProperty(value= "")
- @TableField("Temp2")
- private String Temp2;
-
- @ApiModelProperty(value= "")
- @TableField("Temp3")
- private String Temp3;
-
- @ApiModelProperty(value= "")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- @TableField("MakeDate")
- private Date MakeDate;
-
- @ApiModelProperty(value= "")
- @TableField("bPass")
- private Boolean bPass;
-
- @ApiModelProperty(value= "")
- @TableField("bStartIn")
- private Boolean bStartIn;
-
- public LKCheckHedTB() {}
-
- public LKCheckHedTB(String BillNo, Date BillDate, String Remark, String WareId, String WareName, String Temp1, String Temp2, String Temp3, Date MakeDate, Boolean bPass, Boolean bStartIn) {
- this.BillNo = BillNo;
- this.BillDate = BillDate;
- this.Remark = Remark;
- this.WareId = WareId;
- this.WareName = WareName;
- this.Temp1 = Temp1;
- this.Temp2 = Temp2;
- this.Temp3 = Temp3;
- this.MakeDate = MakeDate;
- this.bPass = bPass;
- this.bStartIn = bStartIn;
- }
-
-// LKCheckHedTB checkHedTB = new LKCheckHedTB(
-// null, // [闈炵┖]
-// null, //
-// null, //
-// null, //
-// null, //
-// null, //
-// null, //
-// null, //
-// null, //
-// null, //
-// null //
-// );
-
- public Integer getAutoId() {
- return AutoId;
- }
-
- public void setAutoId(Integer AutoId) {
- this.AutoId = AutoId;
- }
-
- public String getBillNo() {
- return BillNo;
- }
-
- public void setBillNo(String BillNo) {
- this.BillNo = BillNo;
- }
-
- public Date getBillDate() {
- return BillDate;
- }
-
- public String getBillDate$(){
- if (Cools.isEmpty(this.BillDate)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.BillDate);
- }
-
- public void setBillDate(Date BillDate) {
- this.BillDate = BillDate;
- }
-
- public String getRemark() {
- return Remark;
- }
-
- public void setRemark(String Remark) {
- this.Remark = Remark;
- }
-
- public String getWareId() {
- return WareId;
- }
-
- public void setWareId(String WareId) {
- this.WareId = WareId;
- }
-
- public String getWareName() {
- return WareName;
- }
-
- public void setWareName(String WareName) {
- this.WareName = WareName;
- }
-
- public String getTemp1() {
- return Temp1;
- }
-
- public void setTemp1(String Temp1) {
- this.Temp1 = Temp1;
- }
-
- public String getTemp2() {
- return Temp2;
- }
-
- public void setTemp2(String Temp2) {
- this.Temp2 = Temp2;
- }
-
- public String getTemp3() {
- return Temp3;
- }
-
- public void setTemp3(String Temp3) {
- this.Temp3 = Temp3;
- }
-
- public Date getMakeDate() {
- return MakeDate;
- }
-
- public String getMakeDate$(){
- if (Cools.isEmpty(this.MakeDate)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.MakeDate);
- }
-
- public void setMakeDate(Date MakeDate) {
- this.MakeDate = MakeDate;
- }
-
- public Boolean getBPass() {
- return bPass;
- }
-
- public void setBPass(Boolean bPass) {
- this.bPass = bPass;
- }
-
- public Boolean getBStartIn() {
- return bStartIn;
- }
-
- public void setBStartIn(Boolean bStartIn) {
- this.bStartIn = bStartIn;
- }
-
-
-}
diff --git a/src/main/java/com/zy/third/lk/entity/OutCancelTB.java b/src/main/java/com/zy/third/lk/entity/OutCancelTB.java
deleted file mode 100644
index f5be6de..0000000
--- a/src/main/java/com/zy/third/lk/entity/OutCancelTB.java
+++ /dev/null
@@ -1,84 +0,0 @@
-package com.zy.third.lk.entity;
-
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.core.common.Cools;import io.swagger.annotations.ApiModelProperty;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.enums.IdType;
-import io.swagger.annotations.ApiModelProperty;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import io.swagger.annotations.ApiModelProperty;
-import org.springframework.format.annotation.DateTimeFormat;
-import io.swagger.annotations.ApiModelProperty;
-
-import com.baomidou.mybatisplus.annotations.TableName;
-import java.io.Serializable;
-
-@TableName("lk_OutCancelTB")
-public class OutCancelTB implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- @TableId(value = "AutoId",type = IdType.AUTO)
- private Integer autoId;
-
- @ApiModelProperty(value= "")
- @TableId(value = "BillNo", type = IdType.INPUT)
- @TableField("BillNo")
- private String BillNo;
-
- @ApiModelProperty(value= "")
- @TableField("opFlag")
- private String opFlag;
-
- @ApiModelProperty(value= "")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- @TableField("MakeDate")
- private Date makedate;
-
-
-
- public OutCancelTB() {}
-
-
-// OutCancelTB outCancelTB = new OutCancelTB(
-// null, // [闈炵┖]
-// null, //
-// null, //
-// null //
-// );
-
- public String getBillNo() {
- return BillNo;
- }
-
- public void setBillNo(String BillNo) {
- this.BillNo = BillNo;
- }
-
- public String getOpFlag() {
- return opFlag;
- }
-
- public void setOpFlag(String opFlag) {
- this.opFlag = opFlag;
- }
-
- public Date getMakedate() {
- return makedate;
- }
-
- public String getMakedate$(){
- if (Cools.isEmpty(this.makedate)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.makedate);
- }
-
- public void setMakedate(Date makedate) {
- this.makedate = makedate;
- }
-
-
-
-}
diff --git a/src/main/java/com/zy/third/lk/entity/OutDetTb.java b/src/main/java/com/zy/third/lk/entity/OutDetTB.java
similarity index 87%
rename from src/main/java/com/zy/third/lk/entity/OutDetTb.java
rename to src/main/java/com/zy/third/lk/entity/OutDetTB.java
index 35dcb3c..01302c4 100644
--- a/src/main/java/com/zy/third/lk/entity/OutDetTb.java
+++ b/src/main/java/com/zy/third/lk/entity/OutDetTB.java
@@ -4,26 +4,14 @@
import com.core.common.Cools;import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.enums.IdType;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiModelProperty;
+
import java.text.SimpleDateFormat;
import java.util.Date;
-import io.swagger.annotations.ApiModelProperty;
+
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import org.springframework.format.annotation.DateTimeFormat;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotations.TableName;
import java.io.Serializable;
@@ -32,7 +20,7 @@
@NoArgsConstructor
@AllArgsConstructor
@TableName("lk_OutDetTb")
-public class OutDetTb implements Serializable {
+public class OutDetTB implements Serializable {
private static final long serialVersionUID = 1L;
diff --git a/src/main/java/com/zy/third/lk/entity/OutDetTbBak.java b/src/main/java/com/zy/third/lk/entity/OutDetTBBak.java
similarity index 86%
rename from src/main/java/com/zy/third/lk/entity/OutDetTbBak.java
rename to src/main/java/com/zy/third/lk/entity/OutDetTBBak.java
index 4a0550f..758c9ee 100644
--- a/src/main/java/com/zy/third/lk/entity/OutDetTbBak.java
+++ b/src/main/java/com/zy/third/lk/entity/OutDetTBBak.java
@@ -4,29 +4,17 @@
import com.core.common.Cools;import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.enums.IdType;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiModelProperty;
+
import java.text.SimpleDateFormat;
import java.util.Date;
-import io.swagger.annotations.ApiModelProperty;
+
import org.springframework.format.annotation.DateTimeFormat;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotations.TableName;
import java.io.Serializable;
@TableName("lk_OutDetTb_bak")
-public class OutDetTbBak implements Serializable {
+public class OutDetTBBak implements Serializable {
private static final long serialVersionUID = 1L;
@@ -100,7 +88,7 @@
- public OutDetTbBak() {}
+ public OutDetTBBak() {}
diff --git a/src/main/java/com/zy/third/lk/entity/OutHedTb.java b/src/main/java/com/zy/third/lk/entity/OutHedTB.java
similarity index 89%
rename from src/main/java/com/zy/third/lk/entity/OutHedTb.java
rename to src/main/java/com/zy/third/lk/entity/OutHedTB.java
index 9907038..d708c69 100644
--- a/src/main/java/com/zy/third/lk/entity/OutHedTb.java
+++ b/src/main/java/com/zy/third/lk/entity/OutHedTB.java
@@ -4,20 +4,14 @@
import com.core.common.Cools;import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.enums.IdType;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiModelProperty;
+
import java.text.SimpleDateFormat;
import java.util.Date;
-import io.swagger.annotations.ApiModelProperty;
+
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import org.springframework.format.annotation.DateTimeFormat;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotations.TableName;
import java.io.Serializable;
@@ -25,8 +19,8 @@
@Data
@NoArgsConstructor
@AllArgsConstructor
-@TableName("lk_OutHedTb")
-public class OutHedTb implements Serializable {
+@TableName("lk_OutHedTB")
+public class OutHedTB implements Serializable {
private static final long serialVersionUID = 1L;
diff --git a/src/main/java/com/zy/third/lk/entity/OutHedTbBak.java b/src/main/java/com/zy/third/lk/entity/OutHedTBBak.java
similarity index 87%
rename from src/main/java/com/zy/third/lk/entity/OutHedTbBak.java
rename to src/main/java/com/zy/third/lk/entity/OutHedTBBak.java
index 9d41b57..4d967bf 100644
--- a/src/main/java/com/zy/third/lk/entity/OutHedTbBak.java
+++ b/src/main/java/com/zy/third/lk/entity/OutHedTBBak.java
@@ -4,23 +4,17 @@
import com.core.common.Cools;import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.enums.IdType;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiModelProperty;
+
import java.text.SimpleDateFormat;
import java.util.Date;
-import io.swagger.annotations.ApiModelProperty;
+
import org.springframework.format.annotation.DateTimeFormat;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotations.TableName;
import java.io.Serializable;
@TableName("lk_OutHedTb_bak")
-public class OutHedTbBak implements Serializable {
+public class OutHedTBBak implements Serializable {
private static final long serialVersionUID = 1L;
@@ -95,9 +89,9 @@
private Boolean bStartIn;
- public OutHedTbBak() {}
+ public OutHedTBBak() {}
- public OutHedTbBak(String BillNo,String IoKindID,String OjectId,String OjbectName,Date makedate,String remark,String temp1,String temp2,String temp3) {
+ public OutHedTBBak(String BillNo, String IoKindID, String OjectId, String OjbectName, Date makedate, String remark, String temp1, String temp2, String temp3) {
this.BillNo = BillNo;
this.IoKindID = IoKindID;
this.OjectId = OjectId;
diff --git a/src/main/java/com/zy/third/lk/task/LKInTBScheduler.java b/src/main/java/com/zy/third/lk/task/LKInTBScheduler.java
new file mode 100644
index 0000000..8da3ca0
--- /dev/null
+++ b/src/main/java/com/zy/third/lk/task/LKInTBScheduler.java
@@ -0,0 +1,240 @@
+package com.zy.third.lk.task;
+
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.core.common.Cools;
+import com.core.exception.CoolException;
+import com.zy.asrs.entity.DocType;
+import com.zy.asrs.entity.Mat;
+import com.zy.asrs.entity.Order;
+import com.zy.asrs.entity.OrderDetl;
+import com.zy.asrs.entity.param.OpenOrderCompleteParam;
+import com.zy.asrs.entity.result.OpenOrderCompeteResult;
+import com.zy.asrs.service.DocTypeService;
+import com.zy.asrs.service.MatService;
+import com.zy.asrs.service.OrderDetlService;
+import com.zy.asrs.service.OrderService;
+import com.zy.common.model.DetlDto;
+import com.zy.common.service.erp.ErpSqlServer;
+import com.zy.third.lk.entity.*;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+
+/**
+ * 鍏ュ簱鏇存柊瀹屾垚鍥炴姤
+ */
+@Slf4j
+@Component
+public class LKInTBScheduler {
+
+ @Autowired
+ private MatService matService;
+
+ @Autowired
+ private OrderService orderService;
+
+ @Autowired
+ private OrderDetlService orderDetlService;
+
+ @Autowired
+ private DocTypeService docTypeService;
+
+ @Autowired
+ private ErpSqlServer erpSqlServer;
+
+ @Transactional
+ @Scheduled(cron = "${erp.refreshtime}")
+ public void pakinOrderComplete() {
+ // 鎵�鏈夎鍗�
+ List<Order> orders = orderService.selectList(new EntityWrapper<Order>().eq("settle", 4L));
+ DocType docType;
+ for (Order order : orders) {
+ docType = docTypeService.selectById(order.getDocType());
+ if (docType == null) {
+ log.error("璇ヨ鍗曠被鍨嬩笉瀛樺湪:" + order.getDocType());
+ throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+ }
+ List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order.getId());
+ if (docType.getPakin() == 1) {
+ //鍏ュ簱鍗�
+ for (OrderDetl orderDetl : orderDetls) {
+ insertInDet(orderDetl);
+ }
+ insertInHed(order);
+ } else {
+ //鍑哄簱鍗�
+ for (OrderDetl orderDetl : orderDetls) {
+ insertOutDet(orderDetl);
+ }
+ insertOutHed(order);
+ }
+ // 淇敼璁㈠崟鐘舵�� 4.瀹屾垚 ===>> 6.宸蹭笂鎶�
+ if (!orderService.updateSettle(order.getId(), 6L, null)) {
+ throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+ }
+ }
+ }
+
+
+ /**
+ * 灏嗗叆搴撳崟鐨勪俊鎭彃鍏ュ埌ERP琛�
+ *
+ * @param orderDetl
+ * @return
+ */
+ @Transactional
+ public boolean insertInDet(OrderDetl orderDetl) {
+ String sqlInDetTb = "select * from lk_InDetTB where BillNo='" + orderDetl.getOrderNo() + "' and " +
+ " ItemId='" + orderDetl.getMatnr() + "' and ItemBatch='" + orderDetl.getBatch() + "' and proType='" + orderDetl.getSpecs() + "'";
+ List<InDetTB> inDets = erpSqlServer.select(sqlInDetTb, InDetTB.class);
+ String sqlInDetTbBak = "select * from lk_InDetTB_Bak where BillNo='" + orderDetl.getOrderNo() + "' and " +
+ " ItemId='" + orderDetl.getMatnr() + "' and ItemBatch='" + orderDetl.getBatch() + "' and proType='" + orderDetl.getSpecs() + "'";
+ List<InDetTB> inDetBaks = erpSqlServer.select(sqlInDetTbBak, InDetTB.class);
+ if (inDets.size() > 0 || inDetBaks.size() > 0) {
+ log.error("璇ュ崟鍙锋枡鍙蜂腑闂磋〃琛ㄨ韩宸插瓨鍦�:" + orderDetl.getOrderNo() + "==>>" + orderDetl.getOrderNo());
+ return true;
+ }
+ Mat mat = matService.selectByMatnr(orderDetl.getMatnr());
+ HashMap<String, Object> content = new HashMap<>();
+ content.put("BillNo", "'" + orderDetl.getOrderNo() + "'");
+ content.put("ItemId", "'" + orderDetl.getThreeCode() + "'");
+ content.put("ItemCode", "'" + orderDetl.getMatnr() + "'");
+ content.put("proType", "'" + orderDetl.getSpecs() + "'");
+ content.put("remark", "'" + orderDetl.getMemo() + "'");
+ content.put("OrderNo", "'" + orderDetl.getOutOrderNo() + "'");
+ content.put("ItemBatch", "'" + orderDetl.getBatch() + "'");
+ content.put("iNo", orderDetl.getId());
+ content.put("DetId", orderDetl.getAutoId());
+ content.put("MainNum", orderDetl.getQty());
+ content.put("LKName", "'涓壃浜屾湡'");
+ int insert = erpSqlServer.insert(InDetTB.class, content);
+
+ if (insert == 1) {
+ log.info("鍏ュ簱鍗曡〃韬洖浼犳垚鍔�:" + content.toString());
+ return true;
+ } else {
+ log.error("鍏ュ簱鍥炰紶澶辫触,瀹炰綋绫绘墦鍗�:" + content.toString());
+ return false;
+ }
+
+ }
+
+ /**
+ * 灏嗗叆搴撳崟鐨勮鎯呬俊鎭彃鍏ュ埌ERP琛�
+ *
+ * @param order
+ * @return
+ */
+ @Transactional
+ public boolean insertInHed(Order order) {
+ String sqlInHedTb = "select * from lk_InHedTB where LKName='涓壃浜屾湡' and BillNo='" + order.getOrderNo() + "'";
+ List<InHedTB> outHeds = erpSqlServer.select(sqlInHedTb, InHedTB.class);
+ String sqlInHedTbBak = "select * from lk_InHedTB_Bak where LKName='涓壃浜屾湡' and BillNo='" + order.getOrderNo() + "'";
+ List<InHedTB> inHedBaks = erpSqlServer.select(sqlInHedTbBak, InHedTB.class);
+ if (outHeds.size() > 0 || inHedBaks.size() > 0) {
+ log.error("璇ュ崟鍙锋枡鍙蜂腑闂磋〃琛ㄥご宸插瓨鍦�:" + order.getOrderNo());
+ return true;
+ }
+ HashMap<String, Object> content = new HashMap<>();
+ content.put("BillNo", "'" + order.getOrderNo() + "'");
+ content.put("IoKindID", "'" + order.getDocType() + "'");
+ content.put("ObjectId", "'" + order.getCstmr() + "'");
+ content.put("ObjectName", "'" + order.getCstmrName() + "'");
+ content.put("Remark", "'" + order.getMemo() + "'");
+ content.put("LKName", "'涓壃'");
+ int insert = erpSqlServer.insert(InHedTB.class, content);
+ String sql = "UPDATE lk_InHedTB SET bPass = 1, LKName='涓壃浜屾湡' WHERE BillNo = '" + order.getOrderNo() + "'";
+ int update = erpSqlServer.update(sql);
+ if (update == 1) {
+ log.info("鍏ュ簱鍗曡〃澶村洖浼犳垚鍔�:" + content.toString());
+ return true;
+ } else {
+ log.error("鍏ュ簱鍗曡〃澶村洖浼犲け璐�:" + content.toString());
+ return false;
+ }
+ }
+
+ /**
+ * 灏嗗叆搴撳崟鐨勪俊鎭彃鍏ュ埌ERP琛�
+ *
+ * @param orderDetl
+ * @return
+ */
+ @Transactional
+ public boolean insertOutDet(OrderDetl orderDetl) {
+ String sqlInDetTb = "select * from lk_OutDetTB where BillNo='" + orderDetl.getOrderNo() + "' and " +
+ " ItemId='" + orderDetl.getMatnr() + "' and ItemBatch='" + orderDetl.getBatch() + "' and proType='" + orderDetl.getSpecs() + "'";
+ List<OutDetTB> inDets = erpSqlServer.select(sqlInDetTb, OutDetTB.class);
+ String sqlInDetTbBak = "select * from lk_OutDetTB_Bak where BillNo='" + orderDetl.getOrderNo() + "' and " +
+ " ItemId='" + orderDetl.getMatnr() + "' and ItemBatch='" + orderDetl.getBatch() + "' and proType='" + orderDetl.getSpecs() + "'";
+ List<OutDetTBBak> inDetBaks = erpSqlServer.select(sqlInDetTbBak, OutDetTBBak.class);
+ if (inDets.size() > 0 || inDetBaks.size() > 0) {
+ log.error("璇ュ崟鍙锋枡鍙蜂腑闂磋〃琛ㄨ韩宸插瓨鍦�:" + orderDetl.getOrderNo() + "==>>" + orderDetl.getOrderNo());
+ return true;
+ }
+ Mat mat = matService.selectByMatnr(orderDetl.getMatnr());
+ HashMap<String, Object> content = new HashMap<>();
+ content.put("BillNo", "'" + orderDetl.getOrderNo() + "'");
+ content.put("ItemId", "'" + orderDetl.getThreeCode() + "'");
+ content.put("ItemCode", "'" + orderDetl.getMatnr() + "'");
+ content.put("proType", "'" + orderDetl.getSpecs() + "'");
+ content.put("remark", "'" + orderDetl.getMemo() + "'");
+ content.put("OrderNo", "'" + orderDetl.getOutOrderNo() + "'");
+ content.put("ItemBatch", "'" + orderDetl.getBatch() + "'");
+ content.put("iNo", orderDetl.getId());
+ content.put("DetId", orderDetl.getAutoId());
+ content.put("MainNum", orderDetl.getQty());
+ content.put("LKName", "'涓壃浜屾湡'");
+ int insert = erpSqlServer.insert(InDetTB.class, content);
+
+ if (insert == 1) {
+ log.info("鍏ュ簱鍗曡〃韬洖浼犳垚鍔�:" + content.toString());
+ return true;
+ } else {
+ log.error("鍏ュ簱鍥炰紶澶辫触,瀹炰綋绫绘墦鍗�:" + content.toString());
+ return false;
+ }
+
+ }
+
+ /**
+ * 灏嗗叆搴撳崟鐨勮鎯呬俊鎭彃鍏ュ埌ERP琛�
+ *
+ * @param order
+ * @return
+ */
+ @Transactional
+ public boolean insertOutHed(Order order) {
+ String sqlInHedTb = "select * from lk_OutHedTB where LKName='涓壃浜屾湡' and BillNo='" + order.getOrderNo() + "'";
+ List<OutHedTB> outHeds = erpSqlServer.select(sqlInHedTb, OutHedTB.class);
+ String sqlInHedTbBak = "select * from lk_OutHedTB_Bak where LKName='涓壃浜屾湡' and BillNo='" + order.getOrderNo() + "'";
+ List<OutHedTBBak> inHedBaks = erpSqlServer.select(sqlInHedTbBak, OutHedTBBak.class);
+ if (outHeds.size() > 0 || inHedBaks.size() > 0) {
+ log.error("璇ュ崟鍙锋枡鍙蜂腑闂磋〃琛ㄥご宸插瓨鍦�:" + order.getOrderNo());
+ return true;
+ }
+ HashMap<String, Object> content = new HashMap<>();
+ content.put("BillNo", "'" + order.getOrderNo() + "'");
+ content.put("IoKindID", "'" + order.getDocType() + "'");
+ content.put("ObjectId", "'" + order.getCstmr() + "'");
+ content.put("ObjectName", "'" + order.getCstmrName() + "'");
+ content.put("Remark", "'" + order.getMemo() + "'");
+ content.put("LKName", "'涓壃'");
+ int insert = erpSqlServer.insert(InHedTB.class, content);
+ String sql = "UPDATE lk_InHedTB SET bPass = 1, LKName='涓壃浜屾湡' WHERE BillNo = '" + order.getOrderNo() + "'";
+ int update = erpSqlServer.update(sql);
+ if (update == 1) {
+ log.info("鍏ュ簱鍗曡〃澶村洖浼犳垚鍔�:" + content.toString());
+ return true;
+ } else {
+ log.error("鍏ュ簱鍗曡〃澶村洖浼犲け璐�:" + content.toString());
+ return false;
+ }
+ }
+}
diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml
index 4b0009d..67a1dcf 100644
--- a/src/main/resources/mapper/LocDetlMapper.xml
+++ b/src/main/resources/mapper/LocDetlMapper.xml
@@ -402,4 +402,47 @@
order by row1
</select>
+
+
+
+
+ <resultMap id="stockStatisDTO" type="com.zy.asrs.entity.StockStatisDTO">
+ <id column="matnr" property="matnr" />
+ <id column="maktx" property="maktx" />
+ <id column="specs" property="specs" />
+ <id column="asrsQty" property="lkQty" />
+ <id column="erpQty" property="erpQty" />
+
+ </resultMap>
+
+ <select id="asrsAndErpList" resultMap="stockStatisDTO">
+ SELECT * FROM(
+ SELECT ROW_NUMBER ( ) OVER ( ORDER BY d.matnr ) AS row, * FROM (
+ SELECT * FROM asr_show_diff WHERE 1 = 1
+ <if test="different != null and different ">
+ and asrsQty = erpQty
+ </if>
+ <if test="matnr != null">
+ AND matnr like #{matnr}
+ </if>
+ <if test="maktx != null">
+ AND maktx like #{maktx}
+ </if>
+ <if test="specs != null">
+ AND specs like #{specs}
+ </if>
+ ) d ) e WHERE 1=1 and e.row between ((#{pageNumber}-1)*#{pageSize}+1) and (#{pageNumber}*#{pageSize})
+ </select>
+ <select id="asrsAndErpCount" resultType="java.lang.Long">
+ SELECT count(*) FROM asr_show_diff WHERE 1 = 1 and asrsQty != erpQty
+ <if test="matnr != null">
+ AND matnr like #{matnr}
+ </if>
+ <if test="maktx != null">
+ AND maktx like #{maktx}
+ </if>
+ <if test="specs != null">
+ AND specs like #{specs}
+ </if>
+ </select>
</mapper>
diff --git a/src/main/webapp/views/locDetlStatis/locDetlStatis.html b/src/main/webapp/views/locDetlStatis/locDetlStatis.html
index a312e9c..c2b9f5a 100644
--- a/src/main/webapp/views/locDetlStatis/locDetlStatis.html
+++ b/src/main/webapp/views/locDetlStatis/locDetlStatis.html
@@ -19,21 +19,40 @@
<input class="layui-input" type="text" name="matnr" placeholder="鍟嗗搧缂栧彿" autocomplete="off">
</div>
</div>
+
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="matnx" placeholder="浜у搧鍚嶇О" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="specs" placeholder="浜у搧瑙勬牸" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input name="different" type="checkbox" lay-skin="switch" value="true" lay-text="鏄剧ず宸紓|鏄剧ず鍏ㄩ儴" lay-filter="different" >
+ </div>
+ </div>
<!-- 寰呮坊鍔� -->
<div id="data-search-btn" class="layui-btn-container layui-form-item" style="display: inline-block">
<button id="search" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="search">鎼滅储
</button>
<button id="reset" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="reset">閲嶇疆
</button>
+
</div>
- <div class="layui-inline">
- <fieldset class="layui-elem-field">
- <legend>鎬昏鏁伴噺</legend>
- <div class="layui-field-box" id="countNum">
- 璇风◢绛�
- </div>
- </fieldset>
- </div>
+<!-- <div class="layui-inline">-->
+<!-- <fieldset class="layui-elem-field">-->
+<!-- <legend>鎬昏鏁伴噺</legend>-->
+<!-- <div class="layui-field-box" id="countNum">-->
+<!-- 璇风◢绛�-->
+<!-- </div>-->
+<!-- </fieldset>-->
+<!-- </div>-->
+
+
</div>
<!-- 琛ㄦ牸 -->
diff --git a/version/lib/framework-3.4.0.jar b/version/lib/framework-3.4.0.jar
new file mode 100644
index 0000000..871669c
--- /dev/null
+++ b/version/lib/framework-3.4.0.jar
Binary files differ
--
Gitblit v1.9.1