diff --git a/.idea/libraries/Maven__cn_hutool_hutool_all_5_8_15.xml b/.idea/libraries/Maven__cn_hutool_hutool_all_5_8_15.xml
deleted file mode 100644
index 177afec..0000000
--- a/.idea/libraries/Maven__cn_hutool_hutool_all_5_8_15.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_google_guava_guava_20_0.xml b/.idea/libraries/Maven__com_google_guava_guava_20_0.xml
deleted file mode 100644
index 6f95861..0000000
--- a/.idea/libraries/Maven__com_google_guava_guava_20_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_modelmapper_modelmapper_2_3_5.xml b/.idea/libraries/Maven__org_modelmapper_modelmapper_2_3_5.xml
deleted file mode 100644
index 8f63525..0000000
--- a/.idea/libraries/Maven__org_modelmapper_modelmapper_2_3_5.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 46abc39..a0df517 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,7 +4,41 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -46,35 +80,35 @@
- {
- "keyToString": {
- "RequestMappingsPanelOrder0": "0",
- "RequestMappingsPanelOrder1": "1",
- "RequestMappingsPanelWidth0": "75",
- "RequestMappingsPanelWidth1": "75",
- "RunOnceActivity.ShowReadmeOnStart": "true",
- "WebServerToolWindowFactoryState": "false",
- "last_opened_file_path": "D:/rpkj/app/xzerp",
- "node.js.detected.package.eslint": "true",
- "node.js.detected.package.tslint": "true",
- "node.js.selected.package.eslint": "(autodetect)",
- "node.js.selected.package.tslint": "(autodetect)",
- "nodejs_package_manager_path": "npm",
- "settings.editor.selected.configurable": "reference.settingsdialog.IDE.editor.colors",
- "spring.configuration.checksum": "e66d70b2c05a7b57c5785db699821511",
- "vue.rearranger.settings.migration": "true"
+
+}]]>
-
-
-
-
-
+
+
+
+
+
@@ -83,11 +117,11 @@
+
-
@@ -157,7 +191,7 @@
-
+
@@ -174,8 +208,8 @@
-
@@ -248,6 +282,21 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
1695345779307
@@ -382,12 +431,65 @@
1701677326544
-
+
+ 1702864544748
+
+
+
+ 1702864544748
+
+
+ 1702864594372
+
+
+
+ 1702864594372
+
+
+ 1703830233868
+
+
+
+ 1703830233868
+
+
+ 1705988229646
+
+
+
+ 1705988229646
+
+
+ 1705991921674
+
+
+
+ 1705991921674
+
+
+ 1706086143777
+
+
+
+ 1706086143777
+
+
+
+
+
+
@@ -413,53 +545,10 @@
-
+
+
-
-
-
- file://$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/service/jcsj/impl/DmCbxxpServiceImpl.java
- 57
-
-
-
- file://$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/service/jcsj/impl/DmCzplpNewServiceImpl.java
- 168
-
-
-
- file://$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/service/jcsj/impl/DmBomServiceImpl.java
- 106
-
-
-
- file://$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/service/pgd/impl/PgdQmjhServiceImpl.java
- 116
-
-
-
-
-
-
-
- file://$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/service/pgd/impl/PgdQmjhServiceImpl.java
- 43
-
-
-
-
-
-
- file://$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/service/pgd/PgdQmjhService.java
- 22
-
-
-
-
-
-
-
diff --git a/.mvn/wrapper/maven-wrapper.jar b/.mvn/wrapper/maven-wrapper.jar
deleted file mode 100644
index cb28b0e..0000000
Binary files a/.mvn/wrapper/maven-wrapper.jar and /dev/null differ
diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties
deleted file mode 100644
index 2e76e18..0000000
--- a/.mvn/wrapper/maven-wrapper.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.4/apache-maven-3.9.4-bin.zip
-wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar
diff --git a/gj_erp.iml b/gj_erp.iml
index f836073..968122c 100644
--- a/gj_erp.iml
+++ b/gj_erp.iml
@@ -32,13 +32,27 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
@@ -57,9 +71,7 @@
-
-
@@ -82,17 +94,15 @@
-
-
-
-
+
+
@@ -104,7 +114,6 @@
-
@@ -119,7 +128,6 @@
-
@@ -159,7 +167,7 @@
-
+
@@ -184,8 +192,6 @@
-
-
@@ -198,6 +204,7 @@
-
+
+
\ No newline at end of file
diff --git a/src/main/java/com/dsic/gj_erp/bean/fd/DmCzfddyb.java b/src/main/java/com/dsic/gj_erp/bean/fd/DmCzfddyb.java
index 12c3fd6..4174ce6 100644
--- a/src/main/java/com/dsic/gj_erp/bean/fd/DmCzfddyb.java
+++ b/src/main/java/com/dsic/gj_erp/bean/fd/DmCzfddyb.java
@@ -2,44 +2,79 @@ package com.dsic.gj_erp.bean.fd;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
-import lombok.Getter;
-import lombok.Setter;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
-@Getter
-@Setter
-public class DmCzfddyb {
- private String czbh;//船只编号
+import java.io.Serializable;
- private String fdh;//分段号
+/**
+ *
+ *
+ *
+ *
+ * @author xhj
+ * @since 2023-05-08
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="DmCzfddyb对象", description="")
+public class DmCzfddyb implements Serializable {
- private String qy;//所属区域
+ private static final long serialVersionUID=1L;
- private Integer frow;//行
+ @ApiModelProperty(value = "船只编号")
+ private String czbh;
- private Integer fcol;//列
+ @ApiModelProperty(value = "分段号")
+ private String fdh;
- private String zydw;//作业单位
+ @ApiModelProperty(value = "所属区域")
+ private String qy;
- private String zycj;//作业车间
+ @ApiModelProperty(value = "行")
+ private Integer frow;
- private String stjhrq;//上胎计划期
+ @ApiModelProperty(value = "列")
+ private Integer fcol;
- private String zzjhrq;//总组计划期
+ @ApiModelProperty(value = "作业单位")
+ private String zydw;
- private String dzjhrq;//大组计划期
+ @ApiModelProperty(value = "作业车间")
+ private String zycj;
- private String xzjhrq;//小组计划期
+ @ApiModelProperty(value = "上胎计划期")
+ private String stjhrq;
- private String kgrq;//开工日期
+ @ApiModelProperty(value = "总组计划期")
+ private String zzjhrq;
- private String wgrq;//完工日期
+ @ApiModelProperty(value = "大组计划期")
+ private String dzjhrq;
- private Integer tpzs;//托盘总数
+ @ApiModelProperty(value = "小组计划期")
+ private String xzjhrq;
- private String zt;//"状态"
+ @ApiModelProperty(value = "开工日期")
+ private String kgrq;
- private String bz;//备注
+ @ApiModelProperty(value = "完工日期")
+ private String wgrq;
+
+ @ApiModelProperty(value = "托盘总数")
+ private Integer tpzs;
+
+ @ApiModelProperty(value = "状态")
+ private String zt;
+
+ @ApiModelProperty(value = "备注")
+ private String bz;
@TableId(value = "id", type = IdType.ASSIGN_UUID)
private String id;
+
+
+
}
diff --git a/src/main/java/com/dsic/gj_erp/bean/fd/DmCzjbb.java b/src/main/java/com/dsic/gj_erp/bean/fd/DmCzjbb.java
new file mode 100644
index 0000000..5c31a21
--- /dev/null
+++ b/src/main/java/com/dsic/gj_erp/bean/fd/DmCzjbb.java
@@ -0,0 +1,254 @@
+package com.dsic.gj_erp.bean.fd;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+
+/**
+ *
+ * 船只基本表
+ *
+ *
+ * @author xhj
+ * @since 2023-05-08
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="DmCzjbb对象", description="船只基本表")
+public class DmCzjbb implements Serializable {
+
+ private static final long serialVersionUID=1L;
+
+ private String fjqzcjs;
+
+ private String cjs;
+
+ private String clbs10;
+
+ private String yqbs02;
+
+ private String zfzy;
+
+ private String yzbs;
+
+ private String xsrq;
+
+ private String gxcjbs;
+
+ private String yqbs06;
+
+ private String ph;
+
+ private String cwfzrq;
+
+ private String yqbs04;
+
+ private String clbs11;
+
+ private String clbs09;
+
+ private String dyjdy;
+
+ private String yqbs03;
+
+ private String txzl1;
+
+ private String ph6;
+
+ private String lrry;
+
+ private String gjfkyz;
+
+ private String ph3;
+
+ private String yqbs05;
+
+ private String czmc;
+
+ private String yqbs;
+
+ private String czjc;
+
+ private String clbs12;
+
+ private String txgy3;
+
+ private String txcz;
+
+ private String gcqy1;
+
+ private String hcbs01;
+
+ private String yqbs09;
+
+ private String pjfs;
+
+ private String hcbs03;
+
+ private String jswgbs;
+
+ private String txzl2;
+
+ private String yqxebs;
+
+ private String lrrq;
+
+ private Integer gjxtws;
+
+ private String gcqy;
+
+ private String ph4;
+
+ private String azqy3;
+
+ private String yqbs12;
+
+ private String txjdy;
+
+ private String yqbs08;
+
+ private String yqdetqryTx;
+
+ private String yqbs10;
+
+ private String hcbs02;
+
+ private String txgy2;
+
+ private String sctrq;
+
+ private String xmbh;
+
+ private String shrq;
+
+ private Integer sl;
+
+ private String gjfjpkfs;
+
+ private String wgbs;
+
+ private String hcbs04;
+
+ private String ph1;
+
+ private String sctrqbz;
+
+ private String yqbs07;
+
+ private String yqbs11;
+
+ private String gxhqby;
+
+ private String hcbs10;
+
+ private String clbs03;
+
+ private String azqy2;
+
+ private String qcbs;
+
+ private String ph7;
+
+ private String clbs01;
+
+ private String gjfjthxz;
+
+ private String hcbs05;
+
+ private String jssxrq;
+
+ @TableId(value = "czbh", type = IdType.ASSIGN_UUID)
+ private String czbh;
+
+ private String qcbs1;
+
+ private String hcbs07;
+
+ private String hcbs09;
+
+ private String gxfjbz;
+
+ private String txgy1;
+
+ private String clbs02;
+
+ private String cdmc;
+
+ private String cwzt;
+
+ private String cimsBs;
+
+ private String kgrq;
+
+ private String cwfzsm;
+
+ private String gxhbbs;
+
+ private String sfqy;
+
+ private String hcbs06;
+
+ private String hcbs08;
+
+ private Double gcxs;
+
+ private String yqdetqrqTx;
+
+ private String cjmc;
+
+ private String azqy1;
+
+ private Double gzjxs;
+
+ private String qzjgrq;
+
+ private String zztczbh;
+
+ private String ycbs;
+
+ private String ph2;
+
+ private String clbs05;
+
+ private String kgrqbz;
+
+ private String hcbs11;
+
+ private String xscz;
+
+ private String gjgxbz;
+
+ private String clbs07;
+
+ private String bz;
+
+ private String yqbs01;
+
+ private String qcbs2;
+
+ private String xl;
+
+ private String txzl3;
+
+ private String jssxsm;
+
+ private String ph8;
+
+ private String ph5;
+
+ private String clbs06;
+
+ private String hcbs12;
+
+ private String clbs04;
+
+ private String gjjdy;
+
+ private String clbs08;
+
+
+}
diff --git a/src/main/java/com/dsic/gj_erp/bean/fd/DmXqdwcjcd.java b/src/main/java/com/dsic/gj_erp/bean/fd/DmXqdwcjcd.java
index c202ea9..c6df0cf 100644
--- a/src/main/java/com/dsic/gj_erp/bean/fd/DmXqdwcjcd.java
+++ b/src/main/java/com/dsic/gj_erp/bean/fd/DmXqdwcjcd.java
@@ -2,15 +2,27 @@ package com.dsic.gj_erp.bean.fd;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
-import lombok.Getter;
-import lombok.Setter;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
import java.io.Serializable;
-@Getter
-@Setter
+/**
+ *
+ *
+ *
+ *
+ * @author xhj
+ * @since 2023-06-16
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="DmXqdwcjcd对象", description="")
public class DmXqdwcjcd implements Serializable {
+
private static final long serialVersionUID=1L;
+
private String cdmc;
private String dwbm;
@@ -28,4 +40,5 @@ public class DmXqdwcjcd implements Serializable {
private String fzry;
+
}
diff --git a/src/main/java/com/dsic/gj_erp/bean/fd/ExcelExport.java b/src/main/java/com/dsic/gj_erp/bean/fd/ExcelExport.java
index e24a075..a0e4155 100644
--- a/src/main/java/com/dsic/gj_erp/bean/fd/ExcelExport.java
+++ b/src/main/java/com/dsic/gj_erp/bean/fd/ExcelExport.java
@@ -1,12 +1,17 @@
package com.dsic.gj_erp.bean.fd;
import com.alibaba.excel.annotation.ExcelProperty;
-import lombok.Getter;
-import lombok.Setter;
+import lombok.Data;
-@Getter
-@Setter
+/**
+ * ExcelExport:
+ *
+ * @author xhj
+ * @date 2023/05/08
+ */
+@Data
public class ExcelExport {
+
@ExcelProperty(index = 0)
private String column000;
@ExcelProperty(index = 1)
@@ -250,4 +255,5 @@ public class ExcelExport {
@ExcelProperty(index = 120)
private String column120;
+
}
diff --git a/src/main/java/com/dsic/gj_erp/bean/fd/FdBean.java b/src/main/java/com/dsic/gj_erp/bean/fd/FdBean.java
index 1113040..fb52dac 100644
--- a/src/main/java/com/dsic/gj_erp/bean/fd/FdBean.java
+++ b/src/main/java/com/dsic/gj_erp/bean/fd/FdBean.java
@@ -1,10 +1,14 @@
package com.dsic.gj_erp.bean.fd;
-import lombok.Getter;
-import lombok.Setter;
+import lombok.Data;
-@Getter
-@Setter
+/**
+ * FdBean:
+ *
+ * @author xhj
+ * @date 2023/05/14
+ */
+@Data
public class FdBean {
private String fdh;
private String color;
diff --git a/src/main/java/com/dsic/gj_erp/bean/fd/TppsQk.java b/src/main/java/com/dsic/gj_erp/bean/fd/TppsQk.java
index da7080e..5045de9 100644
--- a/src/main/java/com/dsic/gj_erp/bean/fd/TppsQk.java
+++ b/src/main/java/com/dsic/gj_erp/bean/fd/TppsQk.java
@@ -1,13 +1,18 @@
package com.dsic.gj_erp.bean.fd;
-import lombok.Getter;
-import lombok.Setter;
+import lombok.Data;
import java.math.BigDecimal;
-@Getter
-@Setter
+/**
+ * TppsQk: 托盘配送情况
+ *
+ * @author xhj
+ * @date 2023/05/13
+ */
+@Data
public class TppsQk {
+
private String czbh;
private String fdh;
private String tpbh;
@@ -15,23 +20,40 @@ public class TppsQk {
private BigDecimal xqsl;
private BigDecimal pssl;
private BigDecimal psbfb;
+
private String ygpprq;
private String fkpprq;
+
private String yjtgq;
+
private String jhxqrq;
private String qfpsrq;
private String qfpsrq1;
private String qfxqrq;
- private String sjpsrq;// 实际配送期
+
+ // 实际配送期
+ private String sjpsrq;
private String sjpsrqmin;
private String sjpsrqmax;
- private String minjprkrq; // 集配入库日期
+
+
+
+
+
+ // 集配入库日期
+ private String minjprkrq;
private String maxjprkrq;
- private String fdxqrq;//分段需求日期
- private String zyzzcjmc;//作业车间及场地
+ //分段需求日期
+ private String fdxqrq;
+ //作业车间及场地
+ private String zyzzcjmc;
private String zyzzssbm;
+
private BigDecimal pssl0;
private BigDecimal pssl5;
private BigDecimal pssl10;
private BigDecimal pssl15;
+
+
+
}
diff --git a/src/main/java/com/dsic/gj_erp/controller/fd/DmCzfddybController.java b/src/main/java/com/dsic/gj_erp/controller/fd/DmCzfddybController.java
index 3ee4e9f..3037bbf 100644
--- a/src/main/java/com/dsic/gj_erp/controller/fd/DmCzfddybController.java
+++ b/src/main/java/com/dsic/gj_erp/controller/fd/DmCzfddybController.java
@@ -1,13 +1,14 @@
package com.dsic.gj_erp.controller.fd;
+
import com.alibaba.excel.EasyExcel;
+import com.dsic.gj_erp.annotation.AuthFunction;
import com.dsic.gj_erp.bean.ResultBean;
import com.dsic.gj_erp.bean.fd.ExcelExport;
import com.dsic.gj_erp.exception.CustomException;
import com.dsic.gj_erp.listeners.ExcelFdListener;
import com.dsic.gj_erp.service.fd.DmCzfddybService;
-import io.swagger.annotations.Authorization;
-import lombok.AllArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
@@ -15,16 +16,27 @@ import javax.servlet.http.HttpServletRequest;
import java.util.List;
import java.util.Map;
+/**
+ *
+ * 前端控制器
+ *
+ *
+ * @author xhj
+ * @since 2023-05-08
+ */
@RestController
@RequestMapping("/api/dmCzfddyb")
-@AllArgsConstructor
public class DmCzfddybController {
- private final DmCzfddybService dmCzfddybService;
-
+
+ @Autowired
+ DmCzfddybService dmCzfddybService;
@PostMapping("/upload")
- @Authorization("")
+ @AuthFunction
@ResponseBody
public ResultBean upload(@RequestParam("file") MultipartFile file , String czbh, String isupload, HttpServletRequest req) throws Exception, CustomException {
+
+ System.out.println(czbh);
+
ExcelFdListener objectListener = new ExcelFdListener();
EasyExcel.read(file.getInputStream(), ExcelExport.class, objectListener).sheet(0).headRowNumber(0).doRead();
List objList = objectListener.getObjectList();
@@ -33,33 +45,34 @@ public class DmCzfddybController {
}
@PostMapping("/getCzFdBase")
- @Authorization("")
- public ResultBean getCzFdBase( HttpServletRequest req,@RequestBody Map map) {
+ @AuthFunction
+ public ResultBean getCzFdBase( HttpServletRequest req,@RequestBody Map map) throws Exception, CustomException {
Map rmap = dmCzfddybService.getCzFdBase(req,map);
return new ResultBean(rmap);
}
@PostMapping("/getList")
- @Authorization("")
- public ResultBean getList( HttpServletRequest req,@RequestBody Map map) throws Exception {
+ @AuthFunction
+ public ResultBean getList( HttpServletRequest req,@RequestBody Map map) throws Exception, CustomException {
Map rmap = dmCzfddybService.getList(map);
return new ResultBean(rmap);
}
@PostMapping("/getTpBase")
- @Authorization("")
- public ResultBean getTpBase( HttpServletRequest req,@RequestBody Map map) throws Exception {
+ @AuthFunction
+ public ResultBean getTpBase( HttpServletRequest req,@RequestBody Map map) throws Exception, CustomException {
Map rmap = dmCzfddybService.getTpBase(req,map);
return new ResultBean(rmap);
}
@PostMapping("/getListFdMx")
- @Authorization("")
- public ResultBean getListFdMx( HttpServletRequest req,@RequestBody Map map) throws Exception {
+ @AuthFunction
+ public ResultBean getListFdMx( HttpServletRequest req,@RequestBody Map map) throws Exception, CustomException {
Map rmap = dmCzfddybService.getListFdMx(map);
return new ResultBean(rmap);
}
}
+
diff --git a/src/main/java/com/dsic/gj_erp/controller/fd/TpbController.java b/src/main/java/com/dsic/gj_erp/controller/fd/TpbController.java
new file mode 100644
index 0000000..0c9e27f
--- /dev/null
+++ b/src/main/java/com/dsic/gj_erp/controller/fd/TpbController.java
@@ -0,0 +1,46 @@
+package com.dsic.gj_erp.controller.fd;
+
+
+import com.dsic.gj_erp.annotation.AuthFunction;
+import com.dsic.gj_erp.bean.ResultBean;
+import com.dsic.gj_erp.bean.fd.TppsQk;
+import com.dsic.gj_erp.exception.CustomException;
+import com.dsic.gj_erp.service.fd.impl.TpImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+import java.util.Map;
+
+/**
+ *
+ * 前端控制器
+ *
+ *
+ * @author xhj
+ * @since 2023-05-08
+ */
+@RestController
+@RequestMapping("/api/tpb")
+public class TpbController {
+ @Autowired
+ TpImpl tpImpl;
+
+ @PostMapping("/findTPxqjh")
+ @AuthFunction
+ public ResultBean findTPxqjh(HttpServletRequest req, @RequestBody Map map) throws Exception, CustomException {
+ List