From 7552e44751c7c1d0e1629f8e8d9621984b88fbc6 Mon Sep 17 00:00:00 2001 From: "WINDOWS-DN6K5JD\\EDY" <1260016348@qq.com> Date: Tue, 2 Apr 2024 09:33:41 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=A5=E5=BA=93=E6=95=B4=E7=90=86=E5=A4=9A?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/duochaxun/Rukuzhengli.vue | 11 + .../{demo1.vue => Zhengliqingdan.vue} | 92 ++-- wms-vue/src/components/duochaxun/demo2.vue | 470 ------------------ .../main/java/com/yc/wms/bean/DcxBean1.java | 13 - .../java/com/yc/wms/bean/Rukuzhengli.java | 42 ++ .../java/com/yc/wms/bean/Zhengliqingdan.java | 2 + .../wms/controller/RukuzhengliController.java | 2 + .../controller/ZhengliqingdanController.java | 2 + .../java/com/yc/wms/service/Rukuzhengli.java | 19 + .../{DcxService.java => Zhengliqingdan.java} | 7 +- .../yc/wms/service/impl/DcxServiceImpl.java | 83 ---- .../yc/wms/service/impl/RukuzhengliImpl.java | 2 + .../wms/service/impl/ZhengliqingdanImpl.java | 23 + 13 files changed, 159 insertions(+), 609 deletions(-) create mode 100644 wms-vue/src/components/duochaxun/Rukuzhengli.vue rename wms-vue/src/components/duochaxun/{demo1.vue => Zhengliqingdan.vue} (93%) delete mode 100644 wms-vue/src/components/duochaxun/demo2.vue delete mode 100644 wms/src/main/java/com/yc/wms/bean/DcxBean1.java create mode 100644 wms/src/main/java/com/yc/wms/bean/Rukuzhengli.java create mode 100644 wms/src/main/java/com/yc/wms/bean/Zhengliqingdan.java create mode 100644 wms/src/main/java/com/yc/wms/controller/RukuzhengliController.java create mode 100644 wms/src/main/java/com/yc/wms/controller/ZhengliqingdanController.java create mode 100644 wms/src/main/java/com/yc/wms/service/Rukuzhengli.java rename wms/src/main/java/com/yc/wms/service/{DcxService.java => Zhengliqingdan.java} (69%) delete mode 100644 wms/src/main/java/com/yc/wms/service/impl/DcxServiceImpl.java create mode 100644 wms/src/main/java/com/yc/wms/service/impl/RukuzhengliImpl.java create mode 100644 wms/src/main/java/com/yc/wms/service/impl/ZhengliqingdanImpl.java diff --git a/wms-vue/src/components/duochaxun/Rukuzhengli.vue b/wms-vue/src/components/duochaxun/Rukuzhengli.vue new file mode 100644 index 0000000..dc1f789 --- /dev/null +++ b/wms-vue/src/components/duochaxun/Rukuzhengli.vue @@ -0,0 +1,11 @@ + + + + + diff --git a/wms-vue/src/components/duochaxun/demo1.vue b/wms-vue/src/components/duochaxun/Zhengliqingdan.vue similarity index 93% rename from wms-vue/src/components/duochaxun/demo1.vue rename to wms-vue/src/components/duochaxun/Zhengliqingdan.vue index 3e5e089..af3e9d0 100644 --- a/wms-vue/src/components/duochaxun/demo1.vue +++ b/wms-vue/src/components/duochaxun/Zhengliqingdan.vue @@ -25,12 +25,12 @@ - + @@ -39,12 +39,12 @@ - + @@ -53,7 +53,7 @@ - + @@ -62,7 +62,7 @@ res.data) + .then(res => { + if (res.code == 200) { + this.LOCS = res.data; + } else { + this.$message.error('获取数据失败'); + } + }) + .catch(function (err) { + console.log(err); + }) + }, + PlantS(){ + //工厂下拉列表数据加载 + this.$axios.post(this.$httpUrl + '/user/Plant', { + + }).then(res => res.data) + .then(res => { + if (res.code == 200) { + this.Plant = res.data; + } else { + this.$message.error('获取数据失败'); + } + }) + .catch(function (err) { + console.log(err); + }) + }, queryUser() { - - console.log(this.RECEIVE_DATE[0]); - console.log(this.ORDER_DATE[0]); - //列表数据加载 this.$axios.post(this.$httpUrl + '/user/queryUser', { pageSize: this.pageSize, pageNum: this.pageNum, param: this.param, - PROP_C2: this.PROP_C2, - PROP_C9: this.PROP_C9, - RECEIVE_DATE: this.RECEIVE_DATE, - ORDER_DATE: this.ORDER_DATE }).then(res => res.data) .then(res => { if (res.code == 200) { diff --git a/wms-vue/src/components/duochaxun/demo2.vue b/wms-vue/src/components/duochaxun/demo2.vue deleted file mode 100644 index 5273982..0000000 --- a/wms-vue/src/components/duochaxun/demo2.vue +++ /dev/null @@ -1,470 +0,0 @@ - - - - - diff --git a/wms/src/main/java/com/yc/wms/bean/DcxBean1.java b/wms/src/main/java/com/yc/wms/bean/DcxBean1.java deleted file mode 100644 index 1f29838..0000000 --- a/wms/src/main/java/com/yc/wms/bean/DcxBean1.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.yc.wms.bean; - -public class DcxBean1 { - public String [] PROP_C9; - - public String sourceId; - - - - - - -} diff --git a/wms/src/main/java/com/yc/wms/bean/Rukuzhengli.java b/wms/src/main/java/com/yc/wms/bean/Rukuzhengli.java new file mode 100644 index 0000000..bf4b11b --- /dev/null +++ b/wms/src/main/java/com/yc/wms/bean/Rukuzhengli.java @@ -0,0 +1,42 @@ +package com.yc.wms.bean; + +import java.util.Date; + +public class DcxBean1 { + //工厂 + public String [] PROP_C9; + + //LOC + public String [] PROP_C2; + + //整理日期 + public Date[] RECEIVE_DATE; + //收货日期 + public Date [] ORDER_DATE; + + //采购单号 + public String sourceId; + + //收货凭证 + public String strBill7; + + //料号 + public String code; + + //批次号 + public String PROP_C1; + + //特殊标记 + public String PROP_C3; + + //SAP接口 + public String CODE; + + //加急标记 + public String strBill11; + + + + + +} diff --git a/wms/src/main/java/com/yc/wms/bean/Zhengliqingdan.java b/wms/src/main/java/com/yc/wms/bean/Zhengliqingdan.java new file mode 100644 index 0000000..0fc864c --- /dev/null +++ b/wms/src/main/java/com/yc/wms/bean/Zhengliqingdan.java @@ -0,0 +1,2 @@ +package com.yc.wms.bean;public class Zhengliqingdan { +} diff --git a/wms/src/main/java/com/yc/wms/controller/RukuzhengliController.java b/wms/src/main/java/com/yc/wms/controller/RukuzhengliController.java new file mode 100644 index 0000000..0c15b48 --- /dev/null +++ b/wms/src/main/java/com/yc/wms/controller/RukuzhengliController.java @@ -0,0 +1,2 @@ +package com.yc.wms.controller;public class RukuzhengliController { +} diff --git a/wms/src/main/java/com/yc/wms/controller/ZhengliqingdanController.java b/wms/src/main/java/com/yc/wms/controller/ZhengliqingdanController.java new file mode 100644 index 0000000..b9b4a42 --- /dev/null +++ b/wms/src/main/java/com/yc/wms/controller/ZhengliqingdanController.java @@ -0,0 +1,2 @@ +package com.yc.wms.controller;public class ZhengliqingdanController { +} diff --git a/wms/src/main/java/com/yc/wms/service/Rukuzhengli.java b/wms/src/main/java/com/yc/wms/service/Rukuzhengli.java new file mode 100644 index 0000000..840b0f6 --- /dev/null +++ b/wms/src/main/java/com/yc/wms/service/Rukuzhengli.java @@ -0,0 +1,19 @@ +package com.yc.wms.service; + +import com.yc.wms.until.Result; + +/** + *

+ * 入库整理： + *

+ * + * @author wms + * @since 2023-04-01 + */ +public interface Rukuzhengli { + //查询下拉列表工厂 + Result Plant(); + + //查询下拉列表 + Result LOC(); +} diff --git a/wms/src/main/java/com/yc/wms/service/DcxService.java b/wms/src/main/java/com/yc/wms/service/Zhengliqingdan.java similarity index 69% rename from wms/src/main/java/com/yc/wms/service/DcxService.java rename to wms/src/main/java/com/yc/wms/service/Zhengliqingdan.java index 4cc9869..0d7b81e 100644 --- a/wms/src/main/java/com/yc/wms/service/DcxService.java +++ b/wms/src/main/java/com/yc/wms/service/Zhengliqingdan.java @@ -1,7 +1,7 @@ package com.yc.wms.service; -import com.yc.wms.bean.DcxBean1; +import com.yc.wms.bean.Rukuzhengli; import com.yc.wms.until.QueryPageUtil; import com.yc.wms.until.Result; @@ -14,11 +14,6 @@ import com.yc.wms.until.Result; * @since 2023-03-04 */ public interface DcxService { - Result readJson(QueryPageUtil query, DcxBean1 bean1); - - - - } diff --git a/wms/src/main/java/com/yc/wms/service/impl/DcxServiceImpl.java b/wms/src/main/java/com/yc/wms/service/impl/DcxServiceImpl.java deleted file mode 100644 index 0da4bae..0000000 --- a/wms/src/main/java/com/yc/wms/service/impl/DcxServiceImpl.java +++ /dev/null @@ -1,83 +0,0 @@ -package com.yc.wms.service.impl; - -import cn.hutool.json.JSONArray; -import cn.hutool.json.JSONObject; -import com.yc.wms.bean.DcxBean1; -import com.yc.wms.service.DcxService; -import com.yc.wms.until.QueryPageUtil; -import com.yc.wms.until.Result; -import com.yc.wms.until.SpringContextHolder; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate; -import org.springframework.jdbc.object.SqlQuery; -import org.springframework.stereotype.Service; - -import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import javax.persistence.EntityManager; -import javax.persistence.Query; - -@Service -@Slf4j -public class DcxServiceImpl implements DcxService { - - @Autowired - private NamedParameterJdbcTemplate jdbcTemplate; - - - - @Override - public Result readJson(QueryPageUtil query,DcxBean1 dcxBean1) { - - - int pageNum = query.getPageNum();//当前页 - int pageSize = query.getPageSize();//条数 - //这里到时候记得自己加 判空 - SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - //System.out.println(map); - -// String startDate = simpleDateFormat.format(query.getStartDate()); - - String sql_bz = "SELECT ROW_NUMBER() OVER(ORDER BY rd.id) AS Row_Num,rd.id,ad.sourceId,ad.strBill7,ad.strBill8,\n" + - "i.CODE,i.NAME,i.UNIT,a.ORDER_DATE,rd.RECEIVE_DATE,\n" + - "rd.OPERATOR,z.NAME z_name,s.LP,ik.PROP_C1,ik.PROP_C2,\n" + - "ik.PROP_C3,ik.PROP_C5,ik.PROP_C8,ik.PROP_C9,\n" + - "rd.BAR_CODE,rd.BE_MOVED,ad.description\n" + - "FROM RECEIVED_RECORD rd \n" + - "LEFT JOIN ASN_DETAIL ad ON ad.id = rd.ASN_DETAIL_ID\n" + - "LEFT JOIN asn a ON a.ID = ad.ASN_ID\n" + - "LEFT JOIN ITEM_KEY ik ON ik.id = rd.ITEM_KEY_ID\n" + - "LEFT JOIN ITEM i ON i.id = ad.ITEM_ID\n" + - "LEFT JOIN stock s ON s.id = rd.SRC_LP\n" + - "LEFT JOIN WORKER w ON w.id = rd.WORKER_ID\n" + - "LEFT JOIN [ZONE] z ON z.id = rd.WAREHOUSE_AREA_ID " + - " where 1=1"; - - //查询条件 - //采购订单 - if(map.get("sourceId")!=null&&!map.get("sourceId").toString().equals("")){ - sql_bz+=" and ad.sourceId ="+"'"+map.get("sourceId").toString()+"'"; - } - //收货凭证 - if(map.get("strBill7")!=null&&!map.get("strBill7").toString().equals("")){ - sql_bz+=" and ad.strBill7 ="+"'"+map.get("strBill7").toString()+"'"; - } - - String sqlCount = "select count(t.id) as nums from(" + sql_bz+") t"; - String sqlFy = "select t.* from(" + sql_bz+") t"; - sqlFy+= " WHERE Row_Num BETWEEN " + (pageNum-1) * pageSize + " AND " + (pageNum) * pageSize; - //查询单数据 - Map listCount = jdbcTemplate.queryForMap(sqlCount, new HashMap<>()); - //查询多条数据据 - List> maps = jdbcTemplate.queryForList(sqlFy, new HashMap<>()); - System.out.println(maps); - - return Result.success(Long.parseLong(listCount.get("nums").toString()),maps); - } - - -} diff --git a/wms/src/main/java/com/yc/wms/service/impl/RukuzhengliImpl.java b/wms/src/main/java/com/yc/wms/service/impl/RukuzhengliImpl.java new file mode 100644 index 0000000..6a7be4d --- /dev/null +++ b/wms/src/main/java/com/yc/wms/service/impl/RukuzhengliImpl.java @@ -0,0 +1,2 @@ +package com.yc.wms.service.impl;public class RukuzhengliImpl { +} diff --git a/wms/src/main/java/com/yc/wms/service/impl/ZhengliqingdanImpl.java b/wms/src/main/java/com/yc/wms/service/impl/ZhengliqingdanImpl.java new file mode 100644 index 0000000..2ffff20 --- /dev/null +++ b/wms/src/main/java/com/yc/wms/service/impl/ZhengliqingdanImpl.java @@ -0,0 +1,23 @@ +package com.yc.wms.service.impl; + +import com.yc.wms.bean.Rukuzhengli; +import com.yc.wms.service.DcxService; +import com.yc.wms.until.QueryPageUtil; +import com.yc.wms.until.Result; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate; +import org.springframework.stereotype.Service; + +import java.text.SimpleDateFormat; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +@Service +@Slf4j +public class DcxServiceImpl implements DcxService { + + + +}