From 8e60f8e5707bf7698d2213013c584e36c8897c0a Mon Sep 17 00:00:00 2001 From: DOUDOU <877258667@qq.com> Date: Tue, 27 Feb 2024 13:15:59 +0800 Subject: [PATCH] =?UTF-8?q?=E8=81=9A=E6=B0=B4=E6=BD=AD=E6=96=AF=E7=91=9E?= =?UTF-8?q?=E5=A5=87=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4=20LR?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/jst/controller/JstController.java | 17 +++ .../java/com/srq/modules/jst/dao/JstDao.java | 8 ++ .../srq/modules/jst/dao/impl/JstDaoImpl.java | 26 ++++ .../data/OtherInOutStorageExceptionData.java | 121 ++++++++++++++++++ .../srq/modules/jst/service/JstService.java | 8 ++ .../jst/service/impl/JstServiceImpl.java | 10 ++ 6 files changed, 190 insertions(+) create mode 100644 src/main/java/com/srq/modules/jst/data/OtherInOutStorageExceptionData.java diff --git a/src/main/java/com/srq/modules/jst/controller/JstController.java b/src/main/java/com/srq/modules/jst/controller/JstController.java index f9e8981..9416193 100644 --- a/src/main/java/com/srq/modules/jst/controller/JstController.java +++ b/src/main/java/com/srq/modules/jst/controller/JstController.java @@ -266,4 +266,21 @@ public class JstController { .put("msg", "操作成功!"); } + /** + * @description: 获取其他出入库异常的信息 + * @author LR + * @date 2023/12/20 15:36 + * @version 1.0 + */ + @RequestMapping(value = "/getOtherInOutException") + public R getOtherInOutException(@RequestBody OtherInOutStorageExceptionData inData){ + List resultList = jstService.getOtherInOutException(inData); + return R.ok() + .put("code", 200) + .put("msg", "操作成功!") + .put("rows", resultList) + .put("total", resultList.size()); + } + + } diff --git a/src/main/java/com/srq/modules/jst/dao/JstDao.java b/src/main/java/com/srq/modules/jst/dao/JstDao.java index 46ecc12..cd023b7 100644 --- a/src/main/java/com/srq/modules/jst/dao/JstDao.java +++ b/src/main/java/com/srq/modules/jst/dao/JstDao.java @@ -204,4 +204,12 @@ public interface JstDao { * @version 1.0 */ List getPurchaseOrderException(String poId, String histType); + + /** + * @description: 获取其他出入库的异常信息 + * @author LR + * @date 2023/12/20 15:39 + * @version 1.0 + */ + List getOtherInOutException(String contract, String partNo, String businessType); } diff --git a/src/main/java/com/srq/modules/jst/dao/impl/JstDaoImpl.java b/src/main/java/com/srq/modules/jst/dao/impl/JstDaoImpl.java index fd61043..a47afd5 100644 --- a/src/main/java/com/srq/modules/jst/dao/impl/JstDaoImpl.java +++ b/src/main/java/com/srq/modules/jst/dao/impl/JstDaoImpl.java @@ -208,6 +208,8 @@ public class JstDaoImpl implements JstDao { StringBuilder sql = new StringBuilder(); sql.append("UPDATE "+dataBaseName+".shop_map_customer_info SET contract = :contract, shop_site = :shopSite,"); sql.append(" shop_id = :shopId, shop_name = :shopName, customer_no = :customerNo, pure_custom = :pureCustom,"); + //添加字段2024-02-27 + sql.append(" salesman_code = :salesmanCode,"); sql.append(" distinguish_custom = :distinguishCustom, consignment_flag = :consignmentFlag, order_type = :orderType"); sql.append(" WHERE id = :id"); parameterJdbcTemplate.update(sql.toString(), new BeanPropertySqlParameterSource(shopStore)); @@ -347,5 +349,29 @@ public class JstDaoImpl implements JstDao { return parameterJdbcTemplate.query(sql.toString(), paramMap, new BeanPropertyRowMapper<>(PurchaseOrderExceptionData.class)); } + @Override + public List getOtherInOutException(String contract, String partNo, String businessType) { + StringBuilder sql = new StringBuilder(); + Map paramMap = new HashMap<>(); + sql.append("SELECT voe.id, voe.contract, voe.transaction_id, voe.part_no, voe.locationNo,"); + sql.append(" voe.hist_type, voe.businessType, voe.direction, voe.qty, voe.price, voe.sync_time, voe.exception_remark"); + sql.append(" FROM view_other_in_out_exception voe"); + sql.append(" WHERE 1 = 1"); + //条件判断 + if(!(null == contract || "".equals(contract))){ + sql.append(" AND voe.contract = :contract"); + paramMap.put("contract", contract); + } + if(!(null == partNo || "".equals(partNo))){ + sql.append(" AND voe.part_no = :partNo"); + paramMap.put("partNo", partNo); + } + if(!"ALL".equalsIgnoreCase(businessType)){ + sql.append(" AND voe.businessType = :businessType"); + paramMap.put("businessType", businessType); + } + return parameterJdbcTemplate.query(sql.toString(), paramMap, new BeanPropertyRowMapper<>(OtherInOutStorageExceptionData.class)); + } + } diff --git a/src/main/java/com/srq/modules/jst/data/OtherInOutStorageExceptionData.java b/src/main/java/com/srq/modules/jst/data/OtherInOutStorageExceptionData.java new file mode 100644 index 0000000..3bbf730 --- /dev/null +++ b/src/main/java/com/srq/modules/jst/data/OtherInOutStorageExceptionData.java @@ -0,0 +1,121 @@ + +package com.srq.modules.jst.data; + +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; + +public class OtherInOutStorageExceptionData { + private int id; + private String transactionId; + private String contract; + private String partNo; + private String locationNo; + private String histType; + private String direction; + private String qty; + private String price; + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private String syncTime; + private String exceptionRemark; + private String businessType; + + public OtherInOutStorageExceptionData() { + } + + public int getId() { + return id; + } + + public void setId(int id) { + this.id = id; + } + + public String getTransactionId() { + return transactionId; + } + + public void setTransactionId(String transactionId) { + this.transactionId = transactionId; + } + + public String getContract() { + return contract; + } + + public void setContract(String contract) { + this.contract = contract; + } + + public String getPartNo() { + return partNo; + } + + public void setPartNo(String partNo) { + this.partNo = partNo; + } + + public String getLocationNo() { + return locationNo; + } + + public void setLocationNo(String locationNo) { + this.locationNo = locationNo; + } + + public String getHistType() { + return histType; + } + + public void setHistType(String histType) { + this.histType = histType; + } + + public String getDirection() { + return direction; + } + + public void setDirection(String direction) { + this.direction = direction; + } + + public String getQty() { + return qty; + } + + public void setQty(String qty) { + this.qty = qty; + } + + public String getPrice() { + return price; + } + + public void setPrice(String price) { + this.price = price; + } + + public String getSyncTime() { + return syncTime; + } + + public void setSyncTime(String syncTime) { + this.syncTime = syncTime; + } + + public String getExceptionRemark() { + return exceptionRemark; + } + + public void setExceptionRemark(String exceptionRemark) { + this.exceptionRemark = exceptionRemark; + } + + public String getBusinessType() { + return businessType; + } + + public void setBusinessType(String businessType) { + this.businessType = businessType; + } +} diff --git a/src/main/java/com/srq/modules/jst/service/JstService.java b/src/main/java/com/srq/modules/jst/service/JstService.java index b87888a..682ab91 100644 --- a/src/main/java/com/srq/modules/jst/service/JstService.java +++ b/src/main/java/com/srq/modules/jst/service/JstService.java @@ -158,4 +158,12 @@ public interface JstService { * @version 1.0 */ void reSyncIfsException(ReSyncIfsData inData); + + /** + * @description: 获取其他出入库异常的信息 + * @author LR + * @date 2023/12/20 15:36 + * @version 1.0 + */ + List getOtherInOutException(OtherInOutStorageExceptionData inData); } diff --git a/src/main/java/com/srq/modules/jst/service/impl/JstServiceImpl.java b/src/main/java/com/srq/modules/jst/service/impl/JstServiceImpl.java index f413354..a82ff94 100644 --- a/src/main/java/com/srq/modules/jst/service/impl/JstServiceImpl.java +++ b/src/main/java/com/srq/modules/jst/service/impl/JstServiceImpl.java @@ -600,4 +600,14 @@ public class JstServiceImpl implements JstService { System.out.println(responseData.getCode()); } + + @Override + public List getOtherInOutException(OtherInOutStorageExceptionData inData) { + //公共参数 + String contract = inData.getContract(); + String partNo = inData.getPartNo(); + String businessType = inData.getBusinessType(); + //查询视图获取异常的信息 + return jstDao.getOtherInOutException(contract, partNo, businessType); + } }