From 63f940a69cdc1a8ff994963d068d27375aab4076 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=91=A3=E5=93=B2=E5=A5=87?= <13840175730@139.com>
Date: Tue, 3 Sep 2024 09:02:20 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=B8=B4=E6=97=B6=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../com/dsic/gj_erp/bean/jhgk/DmYdjh.java | 40 ++++++++++++++++++-
.../com/dsic/gj_erp/bean/zyjh/YcldwInfo.java | 2 +-
.../controller/zyjh/ZyjhController.java | 8 +++-
.../gj_erp/controller/zyjh/dto/PgDto.java | 1 +
.../gj_erp/controller/zyjh/dto/PgdSearch.java | 1 +
.../service/jhgk/impl/DmZrcjhServiceImpl.java | 1 +
.../gj_erp/service/zyjh/YcldwInfoService.java | 2 +-
.../dsic/gj_erp/service/zyjh/ZyjhService.java | 3 +-
.../resources/mappers/jhgk/DmQfxqMapper.xml | 6 +--
9 files changed, 55 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/dsic/gj_erp/bean/jhgk/DmYdjh.java b/src/main/java/com/dsic/gj_erp/bean/jhgk/DmYdjh.java
index a268774..c3149ba 100644
--- a/src/main/java/com/dsic/gj_erp/bean/jhgk/DmYdjh.java
+++ b/src/main/java/com/dsic/gj_erp/bean/jhgk/DmYdjh.java
@@ -4,10 +4,13 @@ import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.dsic.gj_erp.bean.pgd.PgdTzjh;
+import com.dsic.gj_erp.exception.ServiceException;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.EqualsAndHashCode;
+import lombok.Getter;
import java.io.Serializable;
@@ -244,5 +247,40 @@ public class DmYdjh implements Serializable {
private String color;
private String sljhrq;
-
+ private String pwpgrq;
+
+ public void setZtForSl(){
+ this.zt=ZyjhzxEnum.SLFK.code;
+ }
+ public static String getSlZt(){
+ return ZyjhzxEnum.SLFK.code;
+ }
+
+ public void setZtByZyjhzx(String type){
+ ZyjhzxEnum zyjhzxEnum = ZyjhzxEnum.valueOf(type);
+ if (zyjhzxEnum==null){
+ throw new ServiceException(10001,"作业计划执行内容不存在");
+ }
+ this.zt=zyjhzxEnum.code;
+ }
+
+ @AllArgsConstructor
+ private enum ZyjhzxEnum{
+ SLFK("21"),
+ PWPG("31"),
+ PWFK("32"),
+ LLPG("41"),
+ LLFK("42"),
+ HXPG("51"),
+ HXFK("52"),
+ QGPG("61"),
+ QGFK("62"),
+ ;
+ @Getter
+ public String code;
+ }
+
+ public static void main(String[] args) {
+
+ }
}
diff --git a/src/main/java/com/dsic/gj_erp/bean/zyjh/YcldwInfo.java b/src/main/java/com/dsic/gj_erp/bean/zyjh/YcldwInfo.java
index cf829ee..1260acd 100644
--- a/src/main/java/com/dsic/gj_erp/bean/zyjh/YcldwInfo.java
+++ b/src/main/java/com/dsic/gj_erp/bean/zyjh/YcldwInfo.java
@@ -35,7 +35,7 @@ public class YcldwInfo {
private String bfrq;//摆放日期
private ZtEnum zt;
- public static YcldwInfo of(ShangLiao sl){
+ public static YcldwInfo ofSl(ShangLiao sl){
YcldwInfo info=new YcldwInfo();
BeanUtil.copyProperties(sl,info);
info.sl();
diff --git a/src/main/java/com/dsic/gj_erp/controller/zyjh/ZyjhController.java b/src/main/java/com/dsic/gj_erp/controller/zyjh/ZyjhController.java
index b517312..0acfe82 100644
--- a/src/main/java/com/dsic/gj_erp/controller/zyjh/ZyjhController.java
+++ b/src/main/java/com/dsic/gj_erp/controller/zyjh/ZyjhController.java
@@ -39,6 +39,9 @@ public class ZyjhController {
*/
@PostMapping("zx")
public ResultBean<?> zx(@RequestBody PgDto dto) {
+ if (StrUtil.isEmpty(dto.getZxZtName())) {
+ throw new ServiceException(10001,"作业计划执行内容不能为空");
+ }
List<DmYdjh> list=dto.getList();
try {
Field field=DmYdjh.class.getField(dto.getField());
@@ -47,6 +50,7 @@ public class ZyjhController {
String date=DateUtil.date().toString("yyyy/MM/dd");
for(DmYdjh dmYdjh:list){
field.set(dmYdjh,date);
+ dmYdjh.setZtByZyjhzx(dto.getZxZtName());
}
}
zyjhService.updateBatchById(list);
@@ -64,6 +68,8 @@ public class ZyjhController {
List<DmYdjh> list = zyjhService.list(Wrappers.<DmYdjh>query()
//执行查询
.eq(StrUtil.isNotEmpty(search.getField()),search.getField(),search.getUser())
+ .isNull(StrUtil.isEmpty(search.getField()),search.getField())
+ .eq(StrUtil.isNotEmpty(search.getZt()),"zt",search.getZt())
.le(StrUtil.isNotEmpty(search.getJhrqField()),search.getJhrqField(), DateUtil.date().toString("yyyy/MM/dd"))
//跟踪查询
.eq(StrUtil.isNotEmpty(search.getXqrq()),"xqrq",search.getXqrq())
@@ -107,7 +113,7 @@ public class ZyjhController {
@Transactional(rollbackFor = Exception.class)
public ResultBean<?> sl(@RequestBody ShangLiao sl) {
if (!sl.checkCkwp()){
- throw new ServiceException(10009,"物品库存不存在,或库存信息错误");
+ //throw new ServiceException(10009,"物品库存不存在,或库存信息错误");
}
//更新预处理垛位信息
diff --git a/src/main/java/com/dsic/gj_erp/controller/zyjh/dto/PgDto.java b/src/main/java/com/dsic/gj_erp/controller/zyjh/dto/PgDto.java
index 37585d8..ba60955 100644
--- a/src/main/java/com/dsic/gj_erp/controller/zyjh/dto/PgDto.java
+++ b/src/main/java/com/dsic/gj_erp/controller/zyjh/dto/PgDto.java
@@ -10,5 +10,6 @@ import java.util.List;
@Setter
public class PgDto {
private String field;
+ private String zxZtName;
private List<DmYdjh> list;
}
diff --git a/src/main/java/com/dsic/gj_erp/controller/zyjh/dto/PgdSearch.java b/src/main/java/com/dsic/gj_erp/controller/zyjh/dto/PgdSearch.java
index 51b3b33..94c1ec0 100644
--- a/src/main/java/com/dsic/gj_erp/controller/zyjh/dto/PgdSearch.java
+++ b/src/main/java/com/dsic/gj_erp/controller/zyjh/dto/PgdSearch.java
@@ -8,6 +8,7 @@ import lombok.Setter;
public class PgdSearch {
//执行查询
+ private String zt;
private String field;
private String user;
private String jhrqField;
diff --git a/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmZrcjhServiceImpl.java b/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmZrcjhServiceImpl.java
index bfce8f2..61c94f8 100644
--- a/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmZrcjhServiceImpl.java
+++ b/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmZrcjhServiceImpl.java
@@ -139,6 +139,7 @@ public class DmZrcjhServiceImpl extends ServiceImpl<DmZrcjhMapper, DmZrcjh> impl
dmZrcjh.setXh(dmZrcjhOne.getXh());
updateById(dmZrcjh);
}
+ saveDmzrcjhList.add(dmZrcjh);
} else {
dmZrcjh.setBzr(bzr);
dmZrcjh.setBzrq(day);
diff --git a/src/main/java/com/dsic/gj_erp/service/zyjh/YcldwInfoService.java b/src/main/java/com/dsic/gj_erp/service/zyjh/YcldwInfoService.java
index 27ad17a..42e6074 100644
--- a/src/main/java/com/dsic/gj_erp/service/zyjh/YcldwInfoService.java
+++ b/src/main/java/com/dsic/gj_erp/service/zyjh/YcldwInfoService.java
@@ -12,7 +12,7 @@ import org.springframework.stereotype.Service;
public class YcldwInfoService extends ServiceImpl<YcldwInfoMapper, YcldwInfo> {
public YcldwInfo updateForSl(ShangLiao sl){
- YcldwInfo info=YcldwInfo.of(sl);
+ YcldwInfo info=YcldwInfo.ofSl(sl);
baseMapper.insert(info);
return info;
}
diff --git a/src/main/java/com/dsic/gj_erp/service/zyjh/ZyjhService.java b/src/main/java/com/dsic/gj_erp/service/zyjh/ZyjhService.java
index f9bcd7c..7077439 100644
--- a/src/main/java/com/dsic/gj_erp/service/zyjh/ZyjhService.java
+++ b/src/main/java/com/dsic/gj_erp/service/zyjh/ZyjhService.java
@@ -12,8 +12,7 @@ public class ZyjhService extends ServiceImpl<DmYdjhMapper,DmYdjh> {
public void updateForSl(ShangLiao sl){
this.update(Wrappers.<DmYdjh>lambdaUpdate()
- .set(DmYdjh::getZt,"21")
-
+ .set(DmYdjh::getZt,DmYdjh.getSlZt())
.eq(DmYdjh::getId,sl.getYdjh().getId())
);
}
diff --git a/src/main/resources/mappers/jhgk/DmQfxqMapper.xml b/src/main/resources/mappers/jhgk/DmQfxqMapper.xml
index f7e41c2..7f58f8a 100644
--- a/src/main/resources/mappers/jhgk/DmQfxqMapper.xml
+++ b/src/main/resources/mappers/jhgk/DmQfxqMapper.xml
@@ -27,13 +27,13 @@
dm_sygd_mx.slry,
dm_sygd_mx.pw,
dm_sygd_mx.pwry,
- dm_sygd_mx.pwrq pwjhrq,
+ dm_sygd_mx.pwrq,
dm_sygd_mx.hxsb,
dm_sygd_mx.hxry,
- dm_sygd_mx.hxrq hxjhrq,
+ dm_sygd_mx.hxrq,
dm_sygd_mx.qgsb,
dm_sygd_mx.qgry,
- dm_sygd_mx.qgrq qgjhrq,
+ dm_sygd_mx.qgrq,
dm_sygd_mx.pwsb,
dm_sygd_mx.DC_FD,
dm_sygd_mx.jzbs,