list = new ArrayList<>();
+ QrConfig config = new QrConfig(300, 300);//二维码宽/高
+ // 设置边距，既二维码和背景之间的边距（即白边大小）
+ config.setMargin(0);
+ // 设置前景色，既二维码颜色（青色）
+ //config.setForeColor(Color.CYAN.getRGB());
+ // 设置背景色（灰色）
+ //config.setBackColor(Color.GRAY.getRGB());
+
+// for (int i = 0; i < split.length; i++) {
+// String str = split[i];
+
+// if (str.contains("船名 批量 图纸比例 套料图号 图号 页码")) {
+// str = split[i - 4];
+// QrCodeDto qrCodeDto = new QrCodeDto();
+// try {
+// qrCodeDto.page = Integer.parseInt(str.split(" ")[0]);
+// }catch (Exception e){
+// str = split[i - 3];
+// qrCodeDto.page = Integer.parseInt(str.split(" ")[0]);
+// }
+//
+// list.add(qrCodeDto);
+// }
+// if (str.contains("序号 零件属性零件编号 零件属性 零件属性 零件属性序号 序号 序号零件编号 零件编号 零件编号")) {
+// str = split[i + 1];
+// if (!list.isEmpty()) {
+// String[] split1 = str.split(" ");
+// String dcch = split1[0];
+// String dcpl = split1[1];
+// String tzbh = split1[3];
+// QrCodeDto qrCodeDto = list.get(list.size() - 1);
+//// BitMatrix qrcode = createQrcode(String.format("%s_%s_%s", dcch, dcpl, tzbh));
+//// assert qrcode != null;
+// //qrCodeDto.bufferedImage = MatrixToImageWriter.toBufferedImage(qrcode);
+// qrCodeDto.bufferedImage = QrCodeUtil.generate(String.format("%s_%s_%s", dcch, dcpl, tzbh), config);
+////
+// }
// }
// }
- document.close();
+ for (int pageNumber = 1; pageNumber < document.getNumberOfPages(); ++pageNumber) {
+ PDPage page = document.getPage(pageNumber);
+ String textByRegion = getTextByRegion(page, 80, 50, 1100, 40);
+// System.out.println(textByRegion);
+ String[] split = textByRegion.split(" ");
+ String dcch = split[1];
+ String dcpl = split[3];
+ String tzbh = split[7];
+ String pageIndex = split[12];
+ BufferedImage bufferedImage = QrCodeUtil.generate(String.format("%s_%s_%s", dcch, dcpl, tzbh), config);
+ PDPageContentStream contentStream = new PDPageContentStream(document, page, PDPageContentStream.AppendMode.APPEND, true, true);
+ PDImageXObject qrCodeImage = JPEGFactory.createFromImage(document, bufferedImage);
+ contentStream.drawImage(qrCodeImage, 10, 10, 75, 75); // 在PDF中的坐标位置添加二维码
+ contentStream.close();
+ }
+
+ document.save("E:/updated_document.pdf");
+ document.close();
+ System.out.println(timer.interval());
// 输出提取的文本到控制台
+// System.out.println(text);
// 可以选择将文本写入文件
- String outputPath = "C:/Users/91564/Desktop/B046HC103HN第046批量数控套料图2023-05-11.txt"; // 输出文本文件路径
- Files.write(Paths.get(outputPath), text.getBytes());
+ //String outputPath = "E:/B001HC103HN数控套料图.txt"; // 输出文本文件路径
+ //Files.write(Paths.get(outputPath), text.getBytes());
}
- public static String[] getArrayByIndex(String[] oldArray,int startIndex,int endIndex){
- int newArraylen=endIndex-startIndex+1;
- String[] array=new String[newArraylen];
- for (int i = 0; i < newArraylen; i++) {
- array[i]=oldArray[i+startIndex];
+
+ private static BitMatrix createQrcode(String dataToEncode) {
+ QRCodeWriter qrCodeWriter = new QRCodeWriter();
+ int width = 200;
+ int height = 200;
+ BitMatrix bitMatrix = null;
+ try {
+ return qrCodeWriter.encode(dataToEncode, BarcodeFormat.QR_CODE, width, height);
+ } catch (WriterException e) {
+ e.printStackTrace();
}
- return array;
+ return null;
+ }
+
+ private static String getTextByRegion(PDPage page,double x,double y,double width,double height) throws IOException {
+ PDFTextStripperByArea stripper = new PDFTextStripperByArea();
+ stripper.setSortByPosition(true);
+ stripper.addRegion("textRegion", new Rectangle2D.Double(x, y, width, height)); // 假设二维码区域是100x100，从(100,100)开始
+ stripper.extractRegions(page);
+ return stripper.getTextForRegion("textRegion"); // 获取二维码区域的文本
+ }
+
+
+ static class QrCodeDto {
+ public int page;
+ public BufferedImage bufferedImage;
}
}
diff --git a/src/main/java/com/dsic/gj_erp/annotation/Authorization.java b/src/main/java/com/dsic/gj_erp/annotation/Authorization.java
new file mode 100644
index 0000000..5e7d27f
--- /dev/null
+++ b/src/main/java/com/dsic/gj_erp/annotation/Authorization.java
@@ -0,0 +1,15 @@
+package com.dsic.gj_erp.annotation;
+
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target(value = {ElementType.METHOD})
+@Retention(RetentionPolicy.RUNTIME)
+public @interface Authorization {
+
+ String[] CKDMS() default {};
+
+}
diff --git a/src/main/java/com/dsic/gj_erp/bean/czzj/MpDhsj.java b/src/main/java/com/dsic/gj_erp/bean/czzj/MpDhsj.java
new file mode 100644
index 0000000..53727d7
--- /dev/null
+++ b/src/main/java/com/dsic/gj_erp/bean/czzj/MpDhsj.java
@@ -0,0 +1,83 @@
+package com.dsic.gj_erp.bean.czzj;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.dsic.gj_erp.bean.jhgk.DmYdjhLj;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class MpDhsj {
+
+ @TableId(type = IdType.INPUT)
+ private String dhh;
+
+ private String wph;
+
+ private String wpjb;
+
+ private String gzlx;
+
+ private String gzbm;
+
+ private Double dhsl;
+
+ private Double cpxql;
+
+ private String gysbh;
+
+ private String gylb;
+
+ private String zt;
+
+ private String sysl;
+
+ private String xdtz;
+
+ private String dcCh;
+
+ private String dcPl;
+
+ private String dcFd;//船号+分段号
+
+ private String dcTh;
+
+ private String dcZl;
+
+ private String dcLph;
+
+ private String dcTpbh;
+
+ private String dcTpmc;
+
+ private String hxfl;
+
+ private String dhsl1;
+
+ private String sjksrqg;
+
+ public static MpDhsj of(DmYdjhLj lj,String qgrq,String lph){
+ MpDhsj mp = new MpDhsj();
+ mp.setDcCh(lj.getCzbh());
+ mp.setDcPl(lj.getPl());
+ mp.setDcFd(lj.getCzbh()+"="+lj.getFd());
+ mp.setDcZl(lj.getZl());
+ mp.setDcTh(lj.getTlth());
+ mp.setWph(lj.getLjbh());
+ mp.setDcTpbh(lj.getLjcz());
+ mp.setDcTpmc(lj.getLjgg());
+ mp.setSjksrqg(qgrq);
+ mp.setDhsl(lj.getSl());
+ mp.setCpxql(lj.getSl());
+ mp.setDcLph(lph);
+ mp.setWpjb("L");
+ mp.setGzlx("M");
+ mp.setGzbm("3K");
+ mp.setZt("0");
+ mp.setXdtz("0");
+ mp.setHxfl("B");
+ mp.setDhsl1("0");
+ return mp;
+ }
+}
diff --git a/src/main/java/com/dsic/gj_erp/bean/excel/Err.java b/src/main/java/com/dsic/gj_erp/bean/excel/Err.java
new file mode 100644
index 0000000..90c0672
--- /dev/null
+++ b/src/main/java/com/dsic/gj_erp/bean/excel/Err.java
@@ -0,0 +1,20 @@
+package com.dsic.gj_erp.bean.excel;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * @version V1.0.0
+ * @Title: Err
+ * @Package com.dsic.xzerp.bean.excel
+ * @Description: excel 导入返回错误信息
+ * @author: xhj
+ * @date: 2021/4/14 9:06
+ */
+@Data
+@Accessors(chain = true)
+public class Err {
+ private Integer id;
+ private String text;
+ private String message;
+}
\ No newline at end of file
diff --git a/src/main/java/com/dsic/gj_erp/bean/excel/ExcelDemo.java b/src/main/java/com/dsic/gj_erp/bean/excel/ExcelDemo.java
new file mode 100644
index 0000000..cac5fec
--- /dev/null
+++ b/src/main/java/com/dsic/gj_erp/bean/excel/ExcelDemo.java
@@ -0,0 +1,111 @@
+package com.dsic.gj_erp.bean.excel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+
+/**
+ * @version V1.0.0
+ * @Title: ExcelDemo
+ * @Package com.dsic.xzerp.bean.gxzz.jcsj.excel
+ * @Description: 导入承载对象 通用
+ * @author: xhj
+ * @date: 2021/4/1 12:27
+ */
+@Data
+public class ExcelDemo {
+
+ @ExcelProperty(index = 0)
+ private String col0;
+ @ExcelProperty(index = 1)
+ private String col1;
+ @ExcelProperty(index = 2)
+ private String col2;
+
+ @ExcelProperty(index = 3)
+ private String col3;
+ @ExcelProperty(index = 4)
+ private String col4;
+ @ExcelProperty(index = 5)
+ private String col5;
+ @ExcelProperty(index = 6)
+ private String col6;
+ @ExcelProperty(index = 7)
+ private String col7;
+ @ExcelProperty(index = 8)
+ private String col8;
+ @ExcelProperty(index = 9)
+ private String col9;
+
+ @ExcelProperty(index = 10)
+ private String col10;
+
+ @ExcelProperty(index = 11)
+ private String col11;
+
+ @ExcelProperty(index = 12)
+ private String col12;
+
+ @ExcelProperty(index = 13)
+ private String col13;
+
+ @ExcelProperty(index = 14)
+ private String col14;
+ @ExcelProperty(index = 15)
+ private String col15;
+ @ExcelProperty(index = 16)
+ private String col16;
+ @ExcelProperty(index = 17)
+ private String col17;
+ @ExcelProperty(index = 18)
+ private String col18;
+ @ExcelProperty(index = 19)
+ private String col19;
+ @ExcelProperty(index = 20)
+ private String col20;
+ @ExcelProperty(index = 21)
+ private String col21;
+ @ExcelProperty(index = 22)
+ private String col22;
+ @ExcelProperty(index = 23)
+ private String col23;
+ @ExcelProperty(index = 24)
+ private String col24;
+ @ExcelProperty(index = 25)
+ private String col25;
+
+ @ExcelProperty(index = 26)
+ private String col26;
+
+ @ExcelProperty(index = 27)
+ private String col27;
+ @ExcelProperty(index = 28)
+ private String col28;
+
+
+ // 手动系统
+ @ExcelProperty(index = 29)
+ private String col29;
+
+ @ExcelProperty(index = 30)
+ private String col30;
+
+ @ExcelProperty(index = 31)
+ private String col31;
+
+ @ExcelProperty(index = 32)
+ private String col32;
+
+ @ExcelProperty(index = 33)
+ private String col33;
+
+ @ExcelProperty(index = 34)
+ private String col34;
+
+
+ // 制作图导入 0 g规格 1，2 长度
+ private String temp0;
+ private String temp1;
+ private String temp2;
+ private String temp3;
+
+}
\ 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/bean/jcsj/DmBchxjbp.java b/src/main/java/com/dsic/gj_erp/bean/jcsj/DmBchxjbp.java
index c036902..bb638c7 100644
--- a/src/main/java/com/dsic/gj_erp/bean/jcsj/DmBchxjbp.java
+++ b/src/main/java/com/dsic/gj_erp/bean/jcsj/DmBchxjbp.java
@@ -65,7 +65,7 @@ public class DmBchxjbp implements Serializable {
@TableField("GCBH")
private String gcbh;
- @TableField("HXCD")
+ @TableField("HXCD") // 划线程度
private BigDecimal hxcd;
@TableField("TXBL")
diff --git a/src/main/java/com/dsic/gj_erp/bean/jcsj/DmBchxylp.java b/src/main/java/com/dsic/gj_erp/bean/jcsj/DmBchxylp.java
index 2e88e25..d1dad3c 100644
--- a/src/main/java/com/dsic/gj_erp/bean/jcsj/DmBchxylp.java
+++ b/src/main/java/com/dsic/gj_erp/bean/jcsj/DmBchxylp.java
@@ -129,5 +129,9 @@ public class DmBchxylp implements Serializable {
private String drbs;
+ @ApiModelProperty(value = "物品规格1")
+ @TableField(exist = false)
+ private String wpgg1;
+
}
diff --git a/src/main/java/com/dsic/gj_erp/bean/jcsj/DmBom.java b/src/main/java/com/dsic/gj_erp/bean/jcsj/DmBom.java
index d5610e6..9c127e6 100644
--- a/src/main/java/com/dsic/gj_erp/bean/jcsj/DmBom.java
+++ b/src/main/java/com/dsic/gj_erp/bean/jcsj/DmBom.java
@@ -9,7 +9,6 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
-import org.springframework.data.annotation.Id;
import java.io.Serializable;
import java.math.BigDecimal;
@@ -220,6 +219,7 @@ public class DmBom implements Serializable {
private BigDecimal bcljtlzl;
private BigDecimal bcqpyld;
private String ylbhgg;
+ private String ylbs; // 余料标识
// 反馈工时
diff --git a/src/main/java/com/dsic/gj_erp/bean/jcsj/DmBzry.java b/src/main/java/com/dsic/gj_erp/bean/jcsj/DmBzry.java
index 6ad39fd..b104699 100644
--- a/src/main/java/com/dsic/gj_erp/bean/jcsj/DmBzry.java
+++ b/src/main/java/com/dsic/gj_erp/bean/jcsj/DmBzry.java
@@ -49,8 +49,23 @@ public class DmBzry implements Serializable {
@ApiModelProperty(value = "状态")
private String flagStatus;
- @TableId(value = "id", type = IdType.ASSIGN_UUID)
- private String id;
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+
+
+ private String zyq;
+ private String xgry;
+ private String xgrq;
+ private String zt ; //01 白班 02 夜班
+ private String yzt ; //01 白班 02 夜班
+ private String rqfw ; //01 白班 02 夜班
+ private String bz ; //01 白班 02 夜班
+
+ @TableField(exist = false)
+ private String zzt ; //01 白班 02 夜班
+
+
+
}
diff --git a/src/main/java/com/dsic/gj_erp/bean/jcsj/DmBzzz.java b/src/main/java/com/dsic/gj_erp/bean/jcsj/DmBzzz.java
index fd354a2..c334874 100644
--- a/src/main/java/com/dsic/gj_erp/bean/jcsj/DmBzzz.java
+++ b/src/main/java/com/dsic/gj_erp/bean/jcsj/DmBzzz.java
@@ -31,6 +31,7 @@ public class DmBzzz implements Serializable {
private String factoryId;
private String factoryCode;
private String factoryName;//所属工厂
+ private String kw;//所属跨位
private String workshopId;
private String workshopCode;
private String workshopName;//所属车间
diff --git a/src/main/java/com/dsic/gj_erp/bean/jcsj/DmCzplp.java b/src/main/java/com/dsic/gj_erp/bean/jcsj/DmCzplp.java
index 1e49a44..95c38ae 100644
--- a/src/main/java/com/dsic/gj_erp/bean/jcsj/DmCzplp.java
+++ b/src/main/java/com/dsic/gj_erp/bean/jcsj/DmCzplp.java
@@ -1,9 +1,12 @@
package com.dsic.gj_erp.bean.jcsj;
+import cn.hutool.core.date.DateUtil;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.dsic.gj_erp.bean.jhgk.excel.ZrcAndPlb;
+import com.dsic.gj_erp.exception.ServiceException;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -97,4 +100,20 @@ public class DmCzplp implements Serializable {
private BigDecimal zl;
+ public static DmCzplp createByExcel(String dcCh,ZrcAndPlb item,String yhms){
+ DmCzplp dmCzplp = new DmCzplp();
+ dmCzplp.setDcCh(dcCh);
+ dmCzplp.setDcFd(item.getMfd());
+ try {
+ dmCzplp.setZl(new BigDecimal(item.getTon()));
+ }catch (Exception e){
+ throw new ServiceException(10001,"吨位不是数字");
+ }
+
+ dmCzplp.setDcPl(item.getDcPl());
+ dmCzplp.setLrr(yhms);
+ dmCzplp.setLrrq(DateUtil.format(DateUtil.date(), "yyyy/MM/dd"));
+ return dmCzplp;
+ }
+
}
diff --git a/src/main/java/com/dsic/gj_erp/bean/jcsj/DmCzplpNew.java b/src/main/java/com/dsic/gj_erp/bean/jcsj/DmCzplpNew.java
index 5c33927..6156498 100644
--- a/src/main/java/com/dsic/gj_erp/bean/jcsj/DmCzplpNew.java
+++ b/src/main/java/com/dsic/gj_erp/bean/jcsj/DmCzplpNew.java
@@ -3,6 +3,8 @@ package com.dsic.gj_erp.bean.jcsj;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
+import com.dsic.gj_erp.bean.jhgk.excel.ZrcAndPlb;
+import com.dsic.gj_erp.exception.ServiceException;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -170,5 +172,28 @@ public class DmCzplpNew implements Serializable {
private String xfqLqb1;
-
+ private int dataOrder;
+
+ public static DmCzplpNew createByExcel(String dcCh, String fd, ZrcAndPlb item){
+ DmCzplpNew plp = new DmCzplpNew();
+ plp.setDcCh(dcCh);
+ plp.setDcPl(item.getDcPl());
+ plp.setDcFd(fd);
+ try {
+ plp.setZl(new BigDecimal(item.getTon()));
+ }catch (Exception e){
+ throw new ServiceException(10001,"吨位不是数字");
+ }
+ plp.setGjks(item.getGjks());
+ plp.setGjksZrc(item.getGjks());
+ plp.setDzjsq(item.getGjjs());
+ plp.setDzjsqZrc(item.getGjjs());
+ plp.setXfqTlt(item.getTlt());
+ plp.setXfqLqb(item.getBclqb());
+ plp.setXfqDhqd(item.getDhqd());
+ plp.setBcdq(item.getGldq());
+ plp.setZt("0");
+ plp.setDataOrder(item.getDataOrder());
+ return plp;
+ }
}
diff --git a/src/main/java/com/dsic/gj_erp/bean/jcsj/DmDwxxp.java b/src/main/java/com/dsic/gj_erp/bean/jcsj/DmDwxxp.java
index 3e5cdd5..3f3eb66 100644
--- a/src/main/java/com/dsic/gj_erp/bean/jcsj/DmDwxxp.java
+++ b/src/main/java/com/dsic/gj_erp/bean/jcsj/DmDwxxp.java
@@ -1,5 +1,7 @@
package com.dsic.gj_erp.bean.jcsj;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.github.jeffreyning.mybatisplus.anno.MppMultiId;
import lombok.Getter;
@@ -15,9 +17,11 @@ import java.io.Serializable;
@TableName("dm_dwxxp")
public class DmDwxxp implements Serializable {
- @MppMultiId
+ @TableId(type=IdType.AUTO)
+ private Integer id;
+
private String dwh;//垛位号
- @MppMultiId
private String qy;//区域
+
}
diff --git a/src/main/java/com/dsic/gj_erp/bean/jcsj/EmGcrl.java b/src/main/java/com/dsic/gj_erp/bean/jcsj/EmGcrl.java
index b4501a6..4765d93 100644
--- a/src/main/java/com/dsic/gj_erp/bean/jcsj/EmGcrl.java
+++ b/src/main/java/com/dsic/gj_erp/bean/jcsj/EmGcrl.java
@@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
-import io.swagger.models.auth.In;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -61,7 +60,7 @@ public class EmGcrl implements Serializable {
@ApiModelProperty(value = "最近的工作日")
private String gzr;
- @ApiModelProperty(value = "排班:1:早;2:晚班;3:双班")
+ @ApiModelProperty(value = "排班:0:白班;1:二班;2:夜班;3:双班")
private String pb;
private Double bbgs=7.0;
diff --git a/src/main/java/com/dsic/gj_erp/bean/jcsj/EmGcrlDto.java b/src/main/java/com/dsic/gj_erp/bean/jcsj/EmGcrlDto.java
index ecfc921..cf73d2e 100644
--- a/src/main/java/com/dsic/gj_erp/bean/jcsj/EmGcrlDto.java
+++ b/src/main/java/com/dsic/gj_erp/bean/jcsj/EmGcrlDto.java
@@ -1,20 +1,9 @@
package com.dsic.gj_erp.bean.jcsj;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.dsic.gj_erp.bean.jhgk.DmSygdxq;
-import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import lombok.EqualsAndHashCode;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import java.io.Serializable;
import java.math.BigDecimal;
-import java.util.List;
/**
*
diff --git a/src/main/java/com/dsic/gj_erp/bean/jcsj/EmSbcnp.java b/src/main/java/com/dsic/gj_erp/bean/jcsj/EmSbcnp.java
index 7da9c6e..bf5a35e 100644
--- a/src/main/java/com/dsic/gj_erp/bean/jcsj/EmSbcnp.java
+++ b/src/main/java/com/dsic/gj_erp/bean/jcsj/EmSbcnp.java
@@ -35,8 +35,8 @@ public class EmSbcnp implements Serializable {
@ApiModelProperty(value = "加工跨")
private String kw;
-
private String gx;
+
private String jldw;
@ApiModelProperty(value = "定额工时")
@@ -61,11 +61,15 @@ public class EmSbcnp implements Serializable {
@ApiModelProperty(value = "夜班定额工时")
private Double degsYb;
+
@ApiModelProperty(value = "所属部门")
private String szcs;
@ApiModelProperty(value = "默认设备")
private String sbmc;
+
private String sbbh;
+ private String zyq;//作业区
+
}
diff --git a/src/main/java/com/dsic/gj_erp/bean/jcsj/EmSbjbb.java b/src/main/java/com/dsic/gj_erp/bean/jcsj/EmSbjbb.java
index 8f0b0e9..07e576b 100644
--- a/src/main/java/com/dsic/gj_erp/bean/jcsj/EmSbjbb.java
+++ b/src/main/java/com/dsic/gj_erp/bean/jcsj/EmSbjbb.java
@@ -1,6 +1,9 @@
package com.dsic.gj_erp.bean.jcsj;
-import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
diff --git a/src/main/java/com/dsic/gj_erp/bean/jcsj/EmSbjgry.java b/src/main/java/com/dsic/gj_erp/bean/jcsj/EmSbjgry.java
index f8a324f..dee6ef1 100644
--- a/src/main/java/com/dsic/gj_erp/bean/jcsj/EmSbjgry.java
+++ b/src/main/java/com/dsic/gj_erp/bean/jcsj/EmSbjgry.java
@@ -1,9 +1,7 @@
package com.dsic.gj_erp.bean.jcsj;
import com.alibaba.excel.annotation.format.DateTimeFormat;
-import com.baomidou.mybatisplus.annotation.FieldStrategy;
import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
diff --git a/src/main/java/com/dsic/gj_erp/bean/jcsj/EmSbrydyp.java b/src/main/java/com/dsic/gj_erp/bean/jcsj/EmSbrydyp.java
index d9c296f..b9df005 100644
--- a/src/main/java/com/dsic/gj_erp/bean/jcsj/EmSbrydyp.java
+++ b/src/main/java/com/dsic/gj_erp/bean/jcsj/EmSbrydyp.java
@@ -1,10 +1,8 @@
package com.dsic.gj_erp.bean.jcsj;
-import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
-import com.github.jeffreyning.mybatisplus.anno.MppMultiId;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
diff --git a/src/main/java/com/dsic/gj_erp/bean/jcsj/EmSbwxjh.java b/src/main/java/com/dsic/gj_erp/bean/jcsj/EmSbwxjh.java
index ccec210..b36d318 100644
--- a/src/main/java/com/dsic/gj_erp/bean/jcsj/EmSbwxjh.java
+++ b/src/main/java/com/dsic/gj_erp/bean/jcsj/EmSbwxjh.java
@@ -9,8 +9,6 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
-import javax.persistence.Entity;
-import javax.persistence.Id;
import java.io.Serializable;
/**
diff --git a/src/main/java/com/dsic/gj_erp/bean/jcsj/excel/PlExcelNew.java b/src/main/java/com/dsic/gj_erp/bean/jcsj/excel/PlExcelNew.java
new file mode 100644
index 0000000..f041151
--- /dev/null
+++ b/src/main/java/com/dsic/gj_erp/bean/jcsj/excel/PlExcelNew.java
@@ -0,0 +1,85 @@
+package com.dsic.gj_erp.bean.jcsj.excel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.format.DateTimeFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ *
+ *
+ *
+ *
+ * @author xn
+ * @since 2023-09-11
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="DmCzplpNew对象", description="")
+public class PlExcelNew implements Serializable {
+
+ private static final long serialVersionUID=1L;
+
+ @ApiModelProperty(value = "批量")
+ @ExcelProperty(index = 0)
+ private String dcPL;
+
+
+
+ @ApiModelProperty(value = "分段")
+ @ExcelProperty(index = 1)
+ private String dcFd;
+
+ @ApiModelProperty(value = "吨位")
+ @ExcelProperty(index = 2)
+ private BigDecimal zl;
+
+ @ApiModelProperty(value = "钢加结束")
+ @ExcelProperty(index = 3)
+ @DateTimeFormat("yyyy/MM/dd")
+ private String xzjsq;
+
+ @ApiModelProperty(value = "钢加开始")
+ @ExcelProperty(index = 4)
+ @DateTimeFormat("yyyy/MM/dd")
+ private String gjks;
+
+
+ @ApiModelProperty(value = "套料图")
+ @ExcelProperty(index = 5)
+ @DateTimeFormat("yyyy/MM/dd")
+ private String xfqTlt;
+
+ @ApiModelProperty(value = "板材领取表")
+ @ExcelProperty(index = 6)
+ @DateTimeFormat("yyyy/MM/dd")
+ private String xfqLqb;
+
+ @ApiModelProperty(value = "订货清单发放")
+ @ExcelProperty(index = 7)
+ @DateTimeFormat("yyyy/MM/dd")
+ private String xfqDhqd;
+
+ @ApiModelProperty(value = "钢料到齐时间")
+ @ExcelProperty(index = 8)
+ @DateTimeFormat("yyyy/MM/dd")
+ private String bcdq;
+
+ @ApiModelProperty(value = "备注")
+ @ExcelProperty(index = 9)
+ private String bz;
+
+
+
+
+
+
+
+
+
+}
diff --git a/src/main/java/com/dsic/gj_erp/bean/jhgk/DmDhqdp.java b/src/main/java/com/dsic/gj_erp/bean/jhgk/DmDhqdp.java
index 11c2c1d..a7e5a95 100644
--- a/src/main/java/com/dsic/gj_erp/bean/jhgk/DmDhqdp.java
+++ b/src/main/java/com/dsic/gj_erp/bean/jhgk/DmDhqdp.java
@@ -10,6 +10,7 @@ import lombok.Data;
import lombok.EqualsAndHashCode;
import java.io.Serializable;
+import java.math.BigDecimal;
/**
*
@@ -42,40 +43,40 @@ public class DmDhqdp implements Serializable {
private String wpxh;
@ApiModelProperty(value = "厚度mm")
- private Double thickness;
+ private BigDecimal thickness;
@ApiModelProperty(value = "宽度mm")
- private Double width;
+ private BigDecimal width;
@ApiModelProperty(value = "长度mm")
- private Double length;
+ private BigDecimal length;
@ApiModelProperty(value = "重量吨/张")
- private Double weight;
+ private BigDecimal weight;
@ApiModelProperty(value = "设计数量张")
- private Double sjsl;
+ private BigDecimal sjsl;
@ApiModelProperty(value = "裕量张")
- private Double yl;
+ private BigDecimal yl;
@ApiModelProperty(value = "总数量张")
- private Double zsl;
+ private BigDecimal zsl;
@ApiModelProperty(value = "总重量吨")
- private Double zzl;
+ private BigDecimal zzl;
@ApiModelProperty(value = "利库数量张")
- private Double lksl;
+ private BigDecimal lksl;
@ApiModelProperty(value = "利库重量吨")
- private Double lkzl;
+ private BigDecimal lkzl;
@ApiModelProperty(value = "实订数量张")
- private Double sdzs;
+ private BigDecimal sdzs;
@ApiModelProperty(value = "实订重量吨")
- private Double sdzl;
+ private BigDecimal sdzl;
@ApiModelProperty(value = "备注")
private String bz;
@@ -88,5 +89,32 @@ public class DmDhqdp implements Serializable {
@TableId(value = "id", type = IdType.ASSIGN_UUID)
private String id;
-
+ private TypeEnum type;//T型材,板材,型材
+ private String plzlsl;//批量组立数量
+ private String kdzlsl;//跨道组立数量
+ private String ptybsl;//平铁用板数量
+ private String dhqdrq;//日期(订货清单)
+ private String rev;//版本
+ private String revisor;//编制
+ private String reviewed;//审核
+ private String approved;//批准
+
+ @TableField(exist = false)
+ private String xh;//序号列用于去除合计行
+
+ public void setTxc(){
+ this.type=TypeEnum.TXC;
+ }
+
+ public void setXc(){
+ this.type=TypeEnum.XC;
+ }
+
+ public void setBc(){
+ this.type=TypeEnum.BC;
+ }
+
+ private enum TypeEnum{
+ TXC,XC,BC
+ }
}
diff --git a/src/main/java/com/dsic/gj_erp/bean/jhgk/DmJtsyjh.java b/src/main/java/com/dsic/gj_erp/bean/jhgk/DmJtsyjh.java
index 1219fb5..b61cd54 100644
--- a/src/main/java/com/dsic/gj_erp/bean/jhgk/DmJtsyjh.java
+++ b/src/main/java/com/dsic/gj_erp/bean/jhgk/DmJtsyjh.java
@@ -6,10 +6,8 @@ import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
-import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
import javax.persistence.Entity;
import javax.persistence.Id;
diff --git a/src/main/java/com/dsic/gj_erp/bean/jhgk/DmSygd.java b/src/main/java/com/dsic/gj_erp/bean/jhgk/DmSygd.java
index 88051a1..5e4bbad 100644
--- a/src/main/java/com/dsic/gj_erp/bean/jhgk/DmSygd.java
+++ b/src/main/java/com/dsic/gj_erp/bean/jhgk/DmSygd.java
@@ -9,7 +9,6 @@ import lombok.Data;
import lombok.EqualsAndHashCode;
import java.io.Serializable;
-import java.util.List;
/**
*
diff --git a/src/main/java/com/dsic/gj_erp/bean/jhgk/DmSygdMx.java b/src/main/java/com/dsic/gj_erp/bean/jhgk/DmSygdMx.java
index 736891b..d051e32 100644
--- a/src/main/java/com/dsic/gj_erp/bean/jhgk/DmSygdMx.java
+++ b/src/main/java/com/dsic/gj_erp/bean/jhgk/DmSygdMx.java
@@ -6,6 +6,7 @@ import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
+import com.dsic.gj_erp.bean.jcsj.DmBom;
import com.dsic.gj_erp.pc.Constant;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -13,7 +14,6 @@ import lombok.Data;
import lombok.EqualsAndHashCode;
import java.io.Serializable;
-import java.math.BigDecimal;
/**
*
@@ -92,6 +92,9 @@ public class DmSygdMx implements Serializable {
@ApiModelProperty(value = "上料日期")
private String slrq;
+ @ApiModelProperty(value = "型材抛丸日期")
+ private String xcpw;
+
private String slsb;
@ApiModelProperty(value = "上料人员")
@@ -124,6 +127,9 @@ public class DmSygdMx implements Serializable {
@ApiModelProperty(value = "切割日期")
private String qgrq;
+ @ApiModelProperty(value = "切割结束")
+ private String qgjs;
+
@ApiModelProperty(value = "抛丸设备")
private String pwsb;
@@ -180,6 +186,8 @@ public class DmSygdMx implements Serializable {
@ApiModelProperty(value = "前批余料代")
private Double bcqpyld;
+ private String ylbs;//余料标识
+
private String parentId;
private String ylbhgg;
@@ -206,6 +214,27 @@ public class DmSygdMx implements Serializable {
private String dmgxbm;
private String qjggxbm;
+ @ApiModelProperty(value = "面板挤边")
+ private String mbjb;
+ @ApiModelProperty(value = "七垮型材米数")
+ private String qkxcms;
+ @ApiModelProperty(value = "型材面板")
+ private String xcmb;
+ @ApiModelProperty(value = "分段需求/小组配送结束")
+ private String fdxq;
+ @ApiModelProperty(value = "光电结束")
+ private String gdjs;
+ @ApiModelProperty(value = "备注")
+ private String bz;
+
+ private String bzry;
+ private String bzrq;
+ private String drbs;
+
+
+
+
+
public void 更新排产信息(Constant.工序 _工序,String date){
switch(_工序){
@@ -235,6 +264,7 @@ public class DmSygdMx implements Serializable {
this.qjgrq=date;
break;
case 打磨:
+ this.dmrq=date;
break;
case 号料:
break;
@@ -251,6 +281,7 @@ public class DmSygdMx implements Serializable {
}
}
+
public static DmSygdMx ofWithDmSygdMxlj(DmSygdMxLj lj){
DmSygdMx mx = new DmSygdMx();
BeanUtil.copyProperties(lj,mx);
@@ -296,4 +327,52 @@ public class DmSygdMx implements Serializable {
return mx;
}
+ public void setBomData(DmBom bom){
+ this.lqlb=bom.getLqlb();
+ this.tzbh=bom.getTzbh();
+ this.wpgg=bom.getWpgg();
+ this.wpxh=bom.getWpcz();
+ try {
+ this.hxcd=bom.getHxcd().doubleValue();
+ }catch (Exception ignored){}
+ try {
+ this.dmcd=bom.getDmcd().doubleValue();
+ }catch (Exception ignored){}
+ try {
+ this.qgcd=bom.getQgcd().doubleValue();
+ }catch (Exception ignored){}
+ this.qbs=bom.getQbs();
+ try {
+ this.pklx=Double.valueOf(bom.getPklx());
+ }catch (Exception ignored){}
+ try {
+ this.pkcd=bom.getPkcd().doubleValue();
+ }catch (Exception ignored){}
+ try {
+ this.ljsl=bom.getLjsl().doubleValue();
+ }catch (Exception ignored){}
+ this.zl=bom.getZl();
+ try {
+ this.xcms=bom.getXcshms().doubleValue();
+ }catch (Exception ignored){}
+ this.kw=bom.getKw();
+ this.dcFd=bom.getFd();
+ try {
+ this.bclqzl=bom.getBclqzl().doubleValue();
+ }catch (Exception ignored){}
+ try {
+ this.bcshzl=bom.getBcshzl().doubleValue();
+ }catch (Exception ignored){}
+ try {
+ this.bcylzl=bom.getBcylzl().doubleValue();
+ }catch (Exception ignored){}
+ try {
+ this.bcljtlzl=bom.getBcljtlzl().doubleValue();
+ }catch (Exception ignored){}
+ try {
+ this.bcqpyld=bom.getBcqpyld().doubleValue();
+ }catch (Exception ignored){}
+ this.ylbhgg=bom.getYlbhgg();
+ }
+
}
diff --git a/src/main/java/com/dsic/gj_erp/bean/jhgk/DmSygdMxLj.java b/src/main/java/com/dsic/gj_erp/bean/jhgk/DmSygdMxLj.java
index 6058de4..b4dd290 100644
--- a/src/main/java/com/dsic/gj_erp/bean/jhgk/DmSygdMxLj.java
+++ b/src/main/java/com/dsic/gj_erp/bean/jhgk/DmSygdMxLj.java
@@ -1,6 +1,7 @@
package com.dsic.gj_erp.bean.jhgk;
import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -190,8 +191,14 @@ public class DmSygdMxLj implements Serializable {
private String ylbhgg;
+ @TableField(exist = false)
+ private String ylbs; //余料标识
+
@TableId(value = "id", type = IdType.ASSIGN_UUID)
private String id;
+ public String getUniqueData(){
+ return this.dcch+this.pl+this.tzbh;
+ }
}
diff --git a/src/main/java/com/dsic/gj_erp/bean/jhgk/DmSygdxq.java b/src/main/java/com/dsic/gj_erp/bean/jhgk/DmSygdxq.java
index 91f5654..6fca9dd 100644
--- a/src/main/java/com/dsic/gj_erp/bean/jhgk/DmSygdxq.java
+++ b/src/main/java/com/dsic/gj_erp/bean/jhgk/DmSygdxq.java
@@ -95,4 +95,7 @@ public class DmSygdxq implements Serializable {
@TableField(exist = false)
private List bomList;
+ @TableField(exist = false)
+ private String mbcz;//目标船
+
}
diff --git a/src/main/java/com/dsic/gj_erp/bean/jhgk/DmTzjh.java b/src/main/java/com/dsic/gj_erp/bean/jhgk/DmTzjh.java
index 0a3eb43..edf8b9f 100644
--- a/src/main/java/com/dsic/gj_erp/bean/jhgk/DmTzjh.java
+++ b/src/main/java/com/dsic/gj_erp/bean/jhgk/DmTzjh.java
@@ -9,8 +9,6 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
-import javax.persistence.Entity;
-import javax.persistence.Id;
import java.io.Serializable;
/**
@@ -68,4 +66,12 @@ public class DmTzjh implements Serializable {
private String id;
+ public static DmTzjh of(YdjhImport jh,String fd){
+ DmTzjh tzjh = new DmTzjh();
+ tzjh.setDcCh(jh.getDcCh());
+ tzjh.setDcPl(jh.getDcPl());
+ tzjh.setDcFd(fd);
+ tzjh.setZt("0");
+ return tzjh;
+ }
}
diff --git a/src/main/java/com/dsic/gj_erp/bean/jhgk/DmXbjh.java b/src/main/java/com/dsic/gj_erp/bean/jhgk/DmXbjh.java
index 9834ad5..7f383e3 100644
--- a/src/main/java/com/dsic/gj_erp/bean/jhgk/DmXbjh.java
+++ b/src/main/java/com/dsic/gj_erp/bean/jhgk/DmXbjh.java
@@ -1,8 +1,6 @@
package com.dsic.gj_erp.bean.jhgk;
-import com.alibaba.excel.annotation.ExcelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
@@ -53,6 +51,6 @@ public class DmXbjh implements Serializable {
@ApiModelProperty(value = "船号")
private String dcCh;
-
+ private int version;
}
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 8d48ee5..d87a44a 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
@@ -1,18 +1,23 @@
package com.dsic.gj_erp.bean.jhgk;
+import cn.hutool.core.util.StrUtil;
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;
/**
*
- *
+ *
*
*
* @author xn
@@ -35,7 +40,7 @@ public class DmYdjh implements Serializable {
private String dcPl;
@TableField(exist = false)
- private String xzglxq;
+ private String xzglxq;//来自前方需求
@ApiModelProperty(value = "领取类型")
@TableField("LQLB")
private String lqlb;
@@ -45,6 +50,8 @@ public class DmYdjh implements Serializable {
@ApiModelProperty(value = "规格")
private String wpgg;
+ @TableField(exist = false)
+ private String wpxh1;
@ApiModelProperty(value = "材质")
private String wpxh;
@@ -225,6 +232,10 @@ public class DmYdjh implements Serializable {
@ApiModelProperty(value = "前批余料代")
private Double bcqpyld;
+ private String ylbs;//余料标识
+
+ private String plxh;//批量序号,用于语音批次派工
+
@TableId(value = "id", type = IdType.ASSIGN_UUID)
private String id;
@@ -234,8 +245,220 @@ public class DmYdjh implements Serializable {
private String db;
private String cx;
private String txc;
- private String jhlx="0";
+ private String jhlx;
private String jssjOld;
+
+
+
+
+ @TableField(exist = false)
+ private PgdTzjh pgdTzjh;
+ @TableField(exist = false)
+ private String color;
+
+// private String sljhrq;
+// private String pwpgrq;
+
+ private String djh;//派工单号
+
+ // 生产状态
+ private String sczt; // 生产状态：编制, 提交, 下达, 上料, 抛丸, 理料, 划线/切割, 完成
+
+ // 小组需求期和大组需求期
+ private String slxzxqrq; // 小组需求期
+ private String sldzxqrq; // 大组需求期
+
+
+ private String ckbzrq;
+ private String ckbzry;
+ private String bmbzrq;
+ private String bmbzry;
+ private String bmxgry;
+ private String bmxgrq;
+
+ // 上料信息
+ private String slkcdw; // 库存垛位
+ private String slcs; // 层数
+ private String slxhth; // 小合同号
+ private String slhth; // 合同号
+ private String slwlh; // 物料号
+ private String kcch; // 物料号
+ private String slkcxx; // 所有库存信息
+ private Integer slycldw; // 预处理垛位
+ private Integer slyclcs; // 预处理垛位
+ private String nbsbm; // 预处理垛位
+ private String sllsh; // 预处理垛位
+ private String sldrry; // 预处理垛位
+ private String sldrrq; // 预处理垛位
+ private String sllph; // 预处理垛位
+
+ // 派工及反馈
+ private String slpgry; // 派工人
+ private String slfkry; // 上料反馈人
+ private String slfkrq; // 上料时间
+ private String slbz; // 上料备注
+
+ // 抛丸信息
+ private String pwxcldw; // 取自预处理垛位
+ private Integer pwcs; // 取自层数
+ private String pwpgry; // 派工人
+ private String slpgrq; // 上料派工日期
+ private String pwpgrq; // 抛丸派工日期
+ private String pwfkry; // 抛丸反馈人
+ private String pwfkrq; // 抛丸反馈日期
+ private String pwbz; // 抛丸备注
+
+ // 理料信息
+ private String lldw; // 理料垛位
+ private Integer llcs; // 理料层数
+ private String llpgry; // 派工人
+ private String llpgrq; // 派工日期
+ private String llry; // 施工人
+ private String llfkry; // 反馈人
+ private String llfkrq; // 反馈日期
+ private String llbz; // 备注
+
+ // 划线信息
+ private String hxdw; // 取自理料垛位
+ private Integer hxcs; // 取自层数
+ private String hxpgry; // 划线派工人
+ private String hxpgrq; // 划线派工日期
+ private String hxfkrq; // 划线反馈日期
+ private String hxfkry; // 划线反馈人员
+ private String hxjybs; // 划线借用标识
+ private String hxjych; // 划线借用船号
+ private String hxjypl; // 划线借用批量
+ private String hxjyfd; // 划线借用分段
+ private String hxjyzl; // 划线借用组立
+ private String hxjykw; // 划线借用跨位
+ private String hxjytlth; // 划线借用套料图号
+ private String hxbz; // 划线备注
+
+ // 切割信息
+ private String qgdw; // 取自理料垛位
+ private Integer qgcs; // 取自层数
+ private String qgpgry; // 划线派工人
+ private String qgpgrq; // 划线派工日期
+ private String qgfkrq; // 划线反馈日期
+ private String qgfkry; // 划线反馈人员
+ private String qgjybs; // 划线借用标识
+ private String qgjych; // 划线借用船号
+ private String qgjypl; // 划线借用批量
+ private String qgjyfd; // 划线借用分段
+ private String qgjyzl; // 划线借用组立
+ private String qgjykw; // 划线借用跨位
+ private String qgjytlth; // 划线借用套料图号
+ private String qgbz; // 划线备注
+
+ // 标识信息
+ private String qjgbs; // 曲加工标识
+ private String pkbs; // 坡口标识
+ private String ycbs; // 型材标识
+
+ // 计划日期
+ private String hxjhrq; // 划线计划日期
+ private String qgjhrq; // 切割计划日期
+ private String zcljhrq; // 再处理计划日期
+ private String sljhrq; // 上料计划日期
+ private String pwjhrq; // 抛丸计划日期
+ private String lljhrq; // 理料计划日期
+
+ private String kcbs; // 库存标识
+
+ private String lphqrry;
+ private String lphqrrq;
+
+ private String zyq;
+ private String zyq1;
+ private String ykw;
+ private String kwmc;
+ private String zylx;//流向,对应字典编码类别:zylx
+
+
+ @TableField(exist = false)
+ private Long bs;
+ @TableField(exist = false)
+ private Long slxhthCount;
+ @TableField(exist = false)
+ private Long slCount;
+ @TableField(exist = false)
+ private Long pwCount;
+ @TableField(exist = false)
+ private Long llCount;
+ @TableField(exist = false)
+ private Long hxCount;
+ @TableField(exist = false)
+ private Long qgCount;
+
+ public String getUniqueData(){
+ return StrUtil.format("{}_{}_{}_{}",this.dcCh,this.dcPl,this.dcFd,this.tzbh);
+ }
+
+
+ public void setZtForSl(){
+ this.zt=ZyjhzxEnum.SLFK.code;
+ }
+ public void setForPwpg(){
+ this.zt=ZyjhzxEnum.PWPG.code;
+ }
+ public void setZtForHXFK(){
+ this.zt=ZyjhzxEnum.HXFK.code;
+ }
+ public void setZtForQGFK(){
+ this.zt=ZyjhzxEnum.QGFK.code;
+ }
+
+ public static String getSlZt(){
+ return ZyjhzxEnum.SLFK.code;
+ }
+
+ public static String getLLZt(){
+ return ZyjhzxEnum.LLFK.code;
+ }
+
+ public void setZtByZyjhzx(String type){
+ ZyjhzxEnum zyjhzxEnum = ZyjhzxEnum.valueOf(type);
+ ZyjhzxEnum zt = ZyjhzxEnum.getEnumByCode(this.zt);
+ if (zyjhzxEnum==null){
+ throw new ServiceException(10001,"作业计划执行内容不存在");
+ }
+ this.zt=zyjhzxEnum.computeCode<=zt.computeCode?zt.code:zyjhzxEnum.code;
+ }
+
+ @AllArgsConstructor
+ private enum ZyjhzxEnum{
+ YXF("2",2),
+ SLPP("11",11), // 上料匹配 比对库存给上垛位
+ SLFK("21",21),
+ PWPG("31",31),
+ PWFK("32",32),
+ LLPG("41",41),
+ LLFK("42",42),
+ HXPG("51",51),
+ HXFK("52",52),
+ QGPG("61",61),
+ QGFK("62",62),
+ //7预留其他工序
+
+ //坡口,曲面,打磨
+ PK("81",81),PKFK("82",82), QM("83",83),QMFK("84",84)
+ ,DM("85",85),DMFK("86",86),
+ WC("99",99)//完成
+ ;
+ @Getter
+ public String code;
+ @Getter
+ public Integer computeCode;
+
+ public static ZyjhzxEnum getEnumByCode(String code){
+ for (ZyjhzxEnum em:ZyjhzxEnum.values()){
+ if (em.code.equals(code)){
+ return em;
+ }
+ }
+ return null;
+ }
+ }
}
diff --git a/src/main/java/com/dsic/gj_erp/bean/jhgk/DmYdjhLj.java b/src/main/java/com/dsic/gj_erp/bean/jhgk/DmYdjhLj.java
index 5ce86c7..5d31fc8 100644
--- a/src/main/java/com/dsic/gj_erp/bean/jhgk/DmYdjhLj.java
+++ b/src/main/java/com/dsic/gj_erp/bean/jhgk/DmYdjhLj.java
@@ -1,6 +1,7 @@
package com.dsic.gj_erp.bean.jhgk;
import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -213,17 +214,147 @@ public class DmYdjhLj implements Serializable {
@TableId(value = "id", type = IdType.ASSIGN_UUID)
private String id;
-
+ // 加工表示
private String qbs;
-
private String pkbs;
private String dmbs;
- private String qdr;
+ // 导入标识
+ private String qdr;
private String pkdr;
private String dmdr;
+ private String dscdw;
+ private String dscry;
+ private String djsry;
+ private String djsrq;
+
+
+ private String qscdw;
+ private String qscry;
+ private String qjsry;
+ private String qjsrq;
+
+ private String pscdw;
+ private String pscry;
+ private String pjsry;
+ private String pjsrq;
+
+ private String lsh;
+ private String ppzt;
+ private String rkry;
+ private String rkrq;
+ private String qrry;
+ private String qrrq;
+ private String qq;
+ private String dw;
+
+ private String qgdh;
+ private String pgdh;
+ private String dgdh;
+
+ // ____________________-
+ @TableField(exist = false)
+ private String dzjz;
+ @TableField(exist = false)
+ private String zxfdxq;
+ @TableField(exist = false)
+ private String xzglxq;
+ @TableField(exist = false)
+ private String dzglxq;
+ @TableField(exist = false)
+ private String xdb;
+ @TableField(exist = false)
+ private String xskj;
+ @TableField(exist = false)
+ private String xpt;
+ @TableField(exist = false)
+ private String xyw;
+ @TableField(exist = false)
+ private String xxc;
+ @TableField(exist = false)
+ private String xtxc;
+ @TableField(exist = false)
+ private String ddb;
+ @TableField(exist = false)
+ private String dqb;
+ @TableField(exist = false)
+ private String dxc;
+ @TableField(exist = false)
+ private String dsj;
+
+
+ //-----------------------
+ @TableField(exist = false)
+ private String slfkry; // 上料反馈人
+ @TableField(exist = false)
+ private String slfkrq; // 上料时间
+ @TableField(exist = false)
+ private String pwfkry; // 抛丸反馈人
+ @TableField(exist = false)
+ private String pwfkrq; // 抛丸反馈日期
+ @TableField(exist = false)
+ private String llfkry; // 反馈人
+ @TableField(exist = false)
+ private String llfkrq; // 反馈日期
+ @TableField(exist = false)
+ private String hxfkrq; // 划线反馈日期
+ @TableField(exist = false)
+ private String hxfkry; // 划线反馈人员
+ @TableField(exist = false)
+ private String qgfkrq; // 划线反馈日期
+ @TableField(exist = false)
+ private String qgfkry; // 划线反馈人员
+ @TableField(exist = false)
+ private String hxjhrq; // 划线计划日期
+ @TableField(exist = false)
+ private String qgjhrq; // 切割计划日期
+ @TableField(exist = false)
+ private String zcljhrq; // 再处理计划日期
+ @TableField(exist = false)
+ private String sljhrq; // 上料计划日期
+ @TableField(exist = false)
+ private String pwjhrq; // 抛丸计划日期
+ @TableField(exist = false)
+ private String lljhrq; // 理料计划日期
+
+
+ private String tz;
+ private String lx;
+ private String xj;
+
+
+ //=====预配盘相关==============
+ @TableField(exist = false)
+ private String yzDcCh;
+ @TableField(exist = false)
+ private String yzDcPl;
+ @TableField(exist = false)
+ private String yzDcFd;
+ @TableField(exist = false)
+ private String yzZl;
+ @TableField(exist = false)
+ private String yzTz;
+ @TableField(exist = false)
+ private String yzLx;
+ @TableField(exist = false)
+ private String yzXj;
+ @TableField(exist = false)
+ private String ypph;
+ @TableField(exist = false)
+ private String yzkw;
+
+ public boolean checkZt(){
+ return !"03".equals(this.pkZt)||!"03".equals(this.qjgZt)||!"03".equals(this.dmZt);
+ }
+
+
+
+
+
+
+
}
diff --git a/src/main/java/com/dsic/gj_erp/bean/jhgk/DmYdjhxf.java b/src/main/java/com/dsic/gj_erp/bean/jhgk/DmYdjhxf.java
index dcb781b..1c8aaed 100644
--- a/src/main/java/com/dsic/gj_erp/bean/jhgk/DmYdjhxf.java
+++ b/src/main/java/com/dsic/gj_erp/bean/jhgk/DmYdjhxf.java
@@ -1,12 +1,7 @@
package com.dsic.gj_erp.bean.jhgk;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import lombok.EqualsAndHashCode;
import java.io.Serializable;
diff --git a/src/main/java/com/dsic/gj_erp/bean/jhgk/DmZrcjh.java b/src/main/java/com/dsic/gj_erp/bean/jhgk/DmZrcjh.java
index dc58f84..6efc216 100644
--- a/src/main/java/com/dsic/gj_erp/bean/jhgk/DmZrcjh.java
+++ b/src/main/java/com/dsic/gj_erp/bean/jhgk/DmZrcjh.java
@@ -4,6 +4,8 @@ import com.alibaba.excel.annotation.ExcelIgnore;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
+import com.dsic.gj_erp.bean.jhgk.excel.ZrcAndPlb;
+import com.dsic.gj_erp.exception.ServiceException;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -137,4 +139,31 @@ public class DmZrcjh implements Serializable {
@ApiModelProperty(value = "编制日期 yyyy/MM/dd")
private String bzrq;
+
+ private int dataOrder;
+
+ public static DmZrcjh createByExcel(String dcCh, String fd, ZrcAndPlb item){
+ DmZrcjh dmZrcjh = new DmZrcjh();
+ dmZrcjh.setDcCh(dcCh);
+ dmZrcjh.setDcPl(item.getDcPl());
+ dmZrcjh.setDcFd(fd);
+ try {
+ dmZrcjh.setZl(Double.valueOf(item.getTon()));
+ }catch (Exception e){
+ throw new ServiceException(10001,"吨位不是数字");
+ }
+ dmZrcjh.setGjks(item.getGjks());
+ dmZrcjh.setKssjDz(item.getGjks());
+ dmZrcjh.setKssjXz(item.getGjks());
+ dmZrcjh.setGjjsDz(item.getGjjs());
+ dmZrcjh.setGjjsXz(item.getGjjs());
+ dmZrcjh.setJssjXz(item.getGjjs());
+ dmZrcjh.setXfqTlt(item.getTlt());
+ dmZrcjh.setXfqLqb(item.getBclqb());
+ dmZrcjh.setXfqDhqd(item.getDhqd());
+ dmZrcjh.setBcdq(item.getGldq());
+ dmZrcjh.setZt("0");
+ dmZrcjh.setDataOrder(item.getDataOrder());
+ return dmZrcjh;
+ }
}
diff --git a/src/main/java/com/dsic/gj_erp/bean/jhgk/YdjhImport.java b/src/main/java/com/dsic/gj_erp/bean/jhgk/YdjhImport.java
new file mode 100644
index 0000000..cb4473c
--- /dev/null
+++ b/src/main/java/com/dsic/gj_erp/bean/jhgk/YdjhImport.java
@@ -0,0 +1,125 @@
+package com.dsic.gj_erp.bean.jhgk;
+
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+
+@Getter
+@Setter
+@TableName("ydjh_import")
+public class YdjhImport {
+
+ @TableId(type = IdType.AUTO)
+ private String id;
+
+ private String dcCh;
+
+ private String dcPl;
+
+ private String dcFd;
+
+ private String bs1;
+
+ private String sl;
+
+ private String xcpw;
+
+ private String pw;
+
+ private String yklm;
+
+ private String yksk;
+
+ private String dbqgks;
+
+ private String ykpkjs;
+
+ private String eklmbs;
+
+ private String lmqgks;
+
+ private String lmqgjs;
+
+ private String eksk;
+
+ private String ekskks;
+
+ private String ekpkjs;
+
+ private String sksk;
+
+ private String skskqgks;
+
+ private String skpkjs;
+
+ private String skpt;
+
+ private String ptks;
+
+ private String ptjs;
+
+ @TableField("qpt_zjs")
+ private String qpt_zjs;
+
+ private String qptjs;
+
+ private String qwbjs;
+
+ private String zl;
+
+ private String fbbs;
+
+ private String fbqgks;
+
+ private String fbqgjs;
+
+ private String skbs;
+
+ private String skqgks;
+
+ private String pkqgjs;
+
+ private String mbjb;
+
+ private String qkxcms;
+
+ private String xcmb;
+
+ private String fdxq;
+
+ private String gdjs;
+
+ private String bz;
+
+ private String zt;
+
+ private int importIndex;
+
+ private String fileName;
+
+ @ApiModelProperty(value = "前方需求小组期")
+ private String qfxqrqxz;
+
+ @ApiModelProperty(value = "前方需求大组期")
+ private String qfxqrqdz;
+
+ private String extData;//1:无基础数据;船号:使用目标船只基础数据;
+
+ @TableField(exist = false)
+ private Boolean qwbBs;
+
+ @TableField(exist = false)
+ private String qgrq;
+
+ public boolean isAvailable(){
+ return !StrUtil.isAllEmpty(this.sl,this.xcpw,this.pw,this.dbqgks,this.ykpkjs,this.lmqgks,this.lmqgjs,
+ this.ekskks,this.ekpkjs,this.skskqgks,this.skpkjs,this.ptks,this.ptjs,this.qpt_zjs,this.qptjs,
+ this.qwbjs,this.fbqgks,this.fbqgjs,this.skqgks,this.pkqgjs,this.mbjb,this.xcmb,this.fdxq,this.gdjs);
+ }
+}
diff --git a/src/main/java/com/dsic/gj_erp/bean/jhgk/YdjhImportNew.java b/src/main/java/com/dsic/gj_erp/bean/jhgk/YdjhImportNew.java
new file mode 100644
index 0000000..93bd591
--- /dev/null
+++ b/src/main/java/com/dsic/gj_erp/bean/jhgk/YdjhImportNew.java
@@ -0,0 +1,177 @@
+package com.dsic.gj_erp.bean.jhgk;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.format.DateTimeFormat;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Getter;
+import lombok.Setter;
+
+
+@Getter
+@Setter
+@TableName("ydjh_import_new")
+public class YdjhImportNew {
+
+ @TableId(type = IdType.AUTO)
+ private String id;
+
+ @ExcelProperty("序号")
+ private String xh;
+
+ @ExcelProperty("产品")
+ private String dcCh;
+
+ @ExcelProperty("批量")
+ private String dcPl;
+
+ @ExcelProperty("分段")
+ private String dcFd;
+
+ @ExcelProperty("板数")
+ private String 板数;
+
+ @ExcelProperty("上料\n完成")
+ @DateTimeFormat("yyyy/MM/dd")
+ private String 上料完成;
+
+ @ExcelProperty("型材抛丸")
+ @DateTimeFormat("yyyy/MM/dd")
+ private String 型材抛丸;
+
+ @ExcelProperty("抛丸\n完成")
+ @DateTimeFormat("yyyy/MM/dd")
+ private String 抛丸完成;
+
+ @ExcelProperty("一垮\n龙门\n板数")
+ private String 一垮龙门板数;
+
+ @ExcelProperty("一垮\n数控\n板数")
+ private String 一垮数控板数;
+
+ @ExcelProperty(value = "切割完成",index = 10)
+ @DateTimeFormat("yyyy/MM/dd")
+ private String 切割完成1;
+
+ @ExcelProperty("二垮\n面板\n板数")
+ private String 二跨面板板数;
+
+ @ExcelProperty(value = "切割完成",index = 12)
+ @DateTimeFormat("yyyy/MM/dd")
+ private String 切割完成2;
+
+ @ExcelProperty("二垮\n数控\n板数")
+ private String 二跨数控板数;
+
+ @ExcelProperty(value = "切割完成",index = 14)
+ @DateTimeFormat("yyyy/MM/dd")
+ private String 切割完成3;
+
+ @ExcelProperty("三垮\n平铁\n板数")
+ private String 三跨平铁板数;
+
+ @ExcelProperty(value = "切割完成",index = 16)
+ @DateTimeFormat("yyyy/MM/dd")
+ private String 切割完成4;
+
+ @ExcelProperty("曲平铁曲完成")
+ @DateTimeFormat("yyyy/MM/dd")
+ private String 曲平铁曲完成;
+
+ @ExcelProperty("三垮\n数控\n板数")
+ private String 三跨数控板数;
+
+ @ExcelProperty(value = "切割完成",index = 19)
+ @DateTimeFormat("yyyy/MM/dd")
+ private String 切割完成5;
+
+ @ExcelProperty("曲外板曲完成")
+ @DateTimeFormat("yyyy/MM/dd")
+ private String 曲外板曲完成;
+
+ @ExcelProperty("四区\n腹板\n板数")
+ private String 四区腹板板数;
+
+ @ExcelProperty(value = "切割完成",index = 22)
+ @DateTimeFormat("yyyy/MM/dd")
+ private String 切割完成6;
+
+ @ExcelProperty("四区\n数控\n板数")
+ private String 四区数控板数;
+
+ @ExcelProperty(value = "切割完成",index = 24)
+ @DateTimeFormat("yyyy/MM/dd")
+ private String 切割完成7;
+
+ @ExcelProperty("面板挤边完成")
+ @DateTimeFormat("yyyy/MM/dd")
+ private String 面板挤边完成;
+
+ @ExcelProperty("面板切割完成")
+ @DateTimeFormat("yyyy/MM/dd")
+ private String 面板切割完成;
+
+ @ExcelProperty("七垮\n型材\n米数")
+ private String 七跨型材米数;
+
+ @ExcelProperty("型材切割完成")
+ @DateTimeFormat("yyyy/MM/dd")
+ private String 型材切割完成;
+
+ @ExcelProperty("光电 完成")
+ @DateTimeFormat("yyyy/MM/dd")
+ private String 光电完成;
+
+ @ExcelProperty("小组\n配送\n完成")
+ @DateTimeFormat("yyyy/MM/dd")
+ private String 小组配送完成;
+
+ @ExcelProperty("备注")
+ private String 备注;
+
+ private String fdxq;
+
+ private String 文件名;
+
+ private boolean nonBom=true;
+
+ private String mbcz;
+
+ private String qfxqrqxz;
+
+ private String qfxqrqdz;
+
+ private String zt="0";
+
+ private String bzr;
+
+ private String bzrq;
+
+ private String shry;
+
+ private String shrq;
+
+ public void updateToBz(String bzr,String bzrq){
+ this.bzr=bzr;
+ this.bzrq=bzrq;
+ }
+
+ public void updateToSh(String shr,String shrq){
+ this.shry =shr;
+ this.shrq=shrq;
+ }
+
+ public void tj(){
+ this.zt=ZtEnum.TJ.ordinal()+"";
+ }
+
+ public void sh(){
+ this.zt=ZtEnum.SH.ordinal()+"";
+ }
+
+ public enum ZtEnum{
+ BZ,TJ,SH
+ }
+
+}
diff --git a/src/main/java/com/dsic/gj_erp/bean/jhgk/Zyjh.java b/src/main/java/com/dsic/gj_erp/bean/jhgk/Zyjh.java
new file mode 100644
index 0000000..b643aef
--- /dev/null
+++ b/src/main/java/com/dsic/gj_erp/bean/jhgk/Zyjh.java
@@ -0,0 +1,123 @@
+package com.dsic.gj_erp.bean.jhgk;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class Zyjh {
+
+ @TableId(value = "id", type = IdType.AUTO)
+ private String id;
+
+ @ApiModelProperty(value = "产品")
+ private String dcCh;
+
+ @ApiModelProperty(value = "数据来源船")
+ private String dcCh1;
+
+ @ApiModelProperty(value = "批量")
+ private String dcPl;
+
+ @ApiModelProperty(value = "领取类型")
+ @TableField("LQLB")
+ private String lqlb;
+
+ @ApiModelProperty(value = "套料图号")
+ private String tzbh;
+
+ @ApiModelProperty(value = "规格")
+ private String wpgg;
+
+ @ApiModelProperty(value = "材质")
+ private String wpxh;
+
+ @ApiModelProperty(value = "划线长度(米)")
+ private volatile Double hxcd;
+ private volatile Double dmcd;
+
+ private String dmrq;
+ private String pkrq;
+ private String llrq;
+
+ @ApiModelProperty(value = "切割长度（米）")
+ private Double qgcd;
+
+ @ApiModelProperty(value = "曲标识")
+ private String qbs;
+ private String qjgrq;
+
+ @ApiModelProperty(value = "坡口类型")
+ private Double pklx;
+
+ @ApiModelProperty(value = "坡口长度")
+ private volatile Double pkcd;
+
+ @ApiModelProperty(value = "零件数量")
+ private Double ljsl;
+
+ @ApiModelProperty(value = "组立")
+ private String zl;
+
+ @ApiModelProperty(value = "钢加大组结束")
+ private String gjjsDz;
+
+
+ @ApiModelProperty(value = "加工类型")
+ private String lx;
+
+ @ApiModelProperty(value = "型材米数")
+ private Double xcms;
+
+ @ApiModelProperty(value = "跨位")
+ private String kw;
+
+ @ApiModelProperty(value = "上料日期")
+ private String slrq;
+
+ private String slsb;
+
+ @ApiModelProperty(value = "上料人员")
+ private String slry;
+
+ @ApiModelProperty(value = "抛丸")
+ private String pw;
+
+ @ApiModelProperty(value = "抛丸人员")
+ private String pwry;
+
+ @ApiModelProperty(value = "抛丸日期")
+ private String pwrq;
+
+ @ApiModelProperty(value = "划线设备")
+ private String hxsb;
+
+ @ApiModelProperty(value = "划线人员")
+ private String hxry;
+
+ @ApiModelProperty(value = "划线日期")
+ private String hxrq;
+
+ @ApiModelProperty(value = "切割设备")
+ private String qgsb;
+
+ @ApiModelProperty(value = "切割人员")
+ private String qgry;
+
+ @ApiModelProperty(value = "切割日期")
+ private String qgrq;
+
+ @ApiModelProperty(value = "抛丸设备")
+ private String pwsb;
+
+ @ApiModelProperty(value = "分段号")
+ @TableField("DC_FD")
+ private String dcFd;
+
+ @ApiModelProperty(value = "状态：0编辑 1提交 2下发")
+ private String zt;
+}
diff --git a/src/main/java/com/dsic/gj_erp/bean/jhgk/dto/Dhdto.java b/src/main/java/com/dsic/gj_erp/bean/jhgk/dto/Dhdto.java
index 9fc1a9f..67c953f 100644
--- a/src/main/java/com/dsic/gj_erp/bean/jhgk/dto/Dhdto.java
+++ b/src/main/java/com/dsic/gj_erp/bean/jhgk/dto/Dhdto.java
@@ -1,7 +1,6 @@
package com.dsic.gj_erp.bean.jhgk.dto;
import com.dsic.gj_erp.bean.jhgk.DmSygdMx;
-import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
diff --git a/src/main/java/com/dsic/gj_erp/bean/jhgk/dto/Pldto.java b/src/main/java/com/dsic/gj_erp/bean/jhgk/dto/Pldto.java
index 0a77c86..97657d5 100644
--- a/src/main/java/com/dsic/gj_erp/bean/jhgk/dto/Pldto.java
+++ b/src/main/java/com/dsic/gj_erp/bean/jhgk/dto/Pldto.java
@@ -1,11 +1,8 @@
package com.dsic.gj_erp.bean.jhgk.dto;
import com.dsic.gj_erp.bean.jcsj.DmCzplpNew;
-import com.dsic.gj_erp.bean.jhgk.DmSygdMx;
import lombok.Data;
-import java.util.List;
-
@Data
public class Pldto extends DmCzplpNew {
diff --git a/src/main/java/com/dsic/gj_erp/bean/jhgk/dto/Xbjhdto.java b/src/main/java/com/dsic/gj_erp/bean/jhgk/dto/Xbjhdto.java
index a990497..e7d345d 100644
--- a/src/main/java/com/dsic/gj_erp/bean/jhgk/dto/Xbjhdto.java
+++ b/src/main/java/com/dsic/gj_erp/bean/jhgk/dto/Xbjhdto.java
@@ -4,7 +4,6 @@ import com.dsic.gj_erp.bean.jhgk.DmSygdMx;
import com.dsic.gj_erp.bean.jhgk.DmXbjh;
import lombok.Data;
-import java.math.BigDecimal;
import java.util.List;
@Data
diff --git a/src/main/java/com/dsic/gj_erp/bean/jhgk/excel/GdxqExcel.java b/src/main/java/com/dsic/gj_erp/bean/jhgk/excel/GdxqExcel.java
index 27e99eb..f29197c 100644
--- a/src/main/java/com/dsic/gj_erp/bean/jhgk/excel/GdxqExcel.java
+++ b/src/main/java/com/dsic/gj_erp/bean/jhgk/excel/GdxqExcel.java
@@ -3,15 +3,8 @@ package com.dsic.gj_erp.bean.jhgk.excel;
import com.alibaba.excel.annotation.ExcelIgnore;
import com.alibaba.excel.annotation.ExcelProperty;
import com.alibaba.excel.annotation.format.DateTimeFormat;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.io.Serializable;
/**
*
diff --git a/src/main/java/com/dsic/gj_erp/bean/jhgk/excel/GdxqExcel1.java b/src/main/java/com/dsic/gj_erp/bean/jhgk/excel/GdxqExcel1.java
index 8beba9f..8a6a051 100644
--- a/src/main/java/com/dsic/gj_erp/bean/jhgk/excel/GdxqExcel1.java
+++ b/src/main/java/com/dsic/gj_erp/bean/jhgk/excel/GdxqExcel1.java
@@ -3,14 +3,8 @@ package com.dsic.gj_erp.bean.jhgk.excel;
import com.alibaba.excel.annotation.ExcelIgnore;
import com.alibaba.excel.annotation.ExcelProperty;
import com.alibaba.excel.annotation.format.DateTimeFormat;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.io.Serializable;
/**
*
diff --git a/src/main/java/com/dsic/gj_erp/bean/jhgk/excel/JhxfExcel.java b/src/main/java/com/dsic/gj_erp/bean/jhgk/excel/JhxfExcel.java
new file mode 100644
index 0000000..64ad9f4
--- /dev/null
+++ b/src/main/java/com/dsic/gj_erp/bean/jhgk/excel/JhxfExcel.java
@@ -0,0 +1,213 @@
+package com.dsic.gj_erp.bean.jhgk.excel;
+
+import cn.hutool.core.util.StrUtil;
+import com.alibaba.excel.annotation.ExcelIgnore;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.format.DateTimeFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * JhxfExcel:
+ *
+ * @author xhj
+ * @date 2024/10/09
+ */
+@Data
+public class JhxfExcel {
+
+
+ @ExcelProperty("产品")
+ private String dcCh;
+
+ @ExcelProperty("批量")
+ private String dcPl;
+
+ @ExcelProperty("分段")
+ private String dcFd;
+
+
+
+
+ @ApiModelProperty(value = "板数")
+ @ExcelProperty("板数")
+ private String bs1;
+
+ @ApiModelProperty(value = "上料")
+ @ExcelProperty("上料")
+ @DateTimeFormat("yyyy/MM/dd")
+ private String sl;
+
+ @ApiModelProperty(value = "型材抛丸")
+ @ExcelProperty("型材抛丸")
+ @DateTimeFormat("yyyy/MM/dd")
+ private String xcpw;
+
+ @ApiModelProperty(value = "抛丸")
+ @ExcelProperty("抛丸")
+ @DateTimeFormat("yyyy/MM/dd")
+ private String pw;
+
+ @ApiModelProperty(value = "一垮龙门板数")
+ @ExcelProperty("一垮龙门板数")
+ private String yklm;
+
+ @ApiModelProperty(value = "一垮数控板数")
+ @ExcelProperty("一垮数控板数")
+ private String yksk;
+
+ @ExcelProperty("大板切割开始")
+ @DateTimeFormat("yyyy/MM/dd")
+ private String dbqgks;
+
+ @ApiModelProperty(value = "坡口切割结束")
+ @ExcelProperty("坡口切割结束")
+ @DateTimeFormat("yyyy/MM/dd")
+ private String ykpkjs;
+
+// @ExcelProperty("二垮龙门板数")
+ private String eklmbs;
+
+// @ExcelProperty("龙门切割开始")
+ @DateTimeFormat("yyyy/MM/dd")
+ private String lmqgks;
+
+// @ExcelProperty("龙门切割结束")
+ @DateTimeFormat("yyyy/MM/dd")
+ private String lmqgjs;
+
+ @ApiModelProperty(value = "二垮数控板数")
+ @ExcelProperty("二垮数控板数")
+ private String eksk;
+
+ @ApiModelProperty(value = "数控切割开始")
+// @ExcelProperty(value ="数控切割开始",index=16)
+ @ExcelProperty(value ="数控切割开始",index=12)
+ @DateTimeFormat("yyyy/MM/dd")
+ private String ekskks;
+
+ @ApiModelProperty(value = "坡口切割结束")
+// @ExcelProperty(value ="坡口切割结束",index=17)
+ @ExcelProperty(value ="坡口切割结束",index=13)
+ @DateTimeFormat("yyyy/MM/dd")
+ private String ekpkjs;
+
+ @ApiModelProperty(value = "三垮数控板数")
+ @ExcelProperty("三垮数控板数")
+ private String sksk;
+
+ @ApiModelProperty(value = "数控切割开始")
+// @ExcelProperty(value ="数控切割开始",index=19)
+ @ExcelProperty(value ="数控切割开始",index=15)
+ @DateTimeFormat("yyyy/MM/dd")
+ private String skskqgks;
+
+ @ApiModelProperty(value = "坡口切割结束")
+// @ExcelProperty(value ="坡口切割结束",index=20)
+ @ExcelProperty(value ="坡口切割结束",index=16)
+ @DateTimeFormat("yyyy/MM/dd")
+ private String skpkjs;
+
+ @ApiModelProperty(value = "三垮平铁板数")
+ @ExcelProperty("三垮平铁板数")
+ private String skpt;
+
+ @ApiModelProperty(value = "平铁切割开始")
+ @ExcelProperty("平铁切割开始")
+ @DateTimeFormat("yyyy/MM/dd")
+ private String ptks;
+
+ @ApiModelProperty(value = "平铁切割结束")
+ @ExcelProperty("平铁切割结束")
+ @DateTimeFormat("yyyy/MM/dd")
+ private String ptjs;
+
+ @ApiModelProperty(value = "曲平铁转结束")
+ @ExcelProperty("曲平铁转结束")
+ @DateTimeFormat("yyyy/MM/dd")
+ private String qpt_zjs;
+
+ @ApiModelProperty(value = "曲平铁结束")
+ @ExcelProperty("曲平铁结束")
+ @DateTimeFormat("yyyy/MM/dd")
+ private String qptjs;
+
+ @ApiModelProperty(value = "曲外板结束")
+ @ExcelProperty("曲外板结束")
+ @DateTimeFormat("yyyy/MM/dd")
+ private String qwbjs;
+
+ @ApiModelProperty(value = "组立")
+ @ExcelProperty("组立")
+ private String zl;
+
+
+ @ApiModelProperty(value = "腹板板数")
+ @ExcelProperty("腹板板数")
+ private String fbbs;
+
+ @ApiModelProperty(value = "腹板切割开始")
+ @ExcelProperty("腹板切割开始")
+ @DateTimeFormat("yyyy/MM/dd")
+ private String fbqgks;
+
+ @ApiModelProperty(value = "腹板切割结束")
+ @ExcelProperty("腹板切割结束")
+ @DateTimeFormat("yyyy/MM/dd")
+ private String fbqgjs;
+
+
+ @ApiModelProperty(value = "数控 板数")
+ @ExcelProperty("数控 板数")
+ private String skbs;
+
+ @ApiModelProperty(value = "数控切割开始")
+// @ExcelProperty(value = "数控切割开始",index = 32)
+ @ExcelProperty(value = "数控切割开始",index = 25)
+ @DateTimeFormat("yyyy/MM/dd")
+ private String skqgks;
+
+
+ @ApiModelProperty(value = "坡口切割结束")
+// @ExcelProperty(value = "坡口切割结束",index = 33)
+ @ExcelProperty(value = "坡口切割结束",index = 26)
+ @DateTimeFormat("yyyy/MM/dd")
+ private String pkqgjs;
+
+
+ @ApiModelProperty(value = "面板挤边")
+ @ExcelProperty("面板挤边")
+ @DateTimeFormat("yyyy/MM/dd")
+ private String mbjb;
+ @ApiModelProperty(value = "七垮型 材米数")
+ @ExcelProperty("七垮型 材米数")
+ private String qkxcms;
+
+ @ApiModelProperty(value = "型材 面板")
+ @ExcelProperty("型材 面板")
+ @DateTimeFormat("yyyy/MM/dd")
+ private String xcmb;
+
+ @ApiModelProperty(value = "分段需求/小组配送结束")
+ @ExcelProperty("小组配送结束")
+ @DateTimeFormat("yyyy/MM/dd")
+ private String fdxq;
+
+ @ApiModelProperty(value = "光电 结束")
+ @ExcelProperty("光电 结束")
+ @DateTimeFormat("yyyy/MM/dd")
+ private String gdjs;
+
+ @ApiModelProperty(value = "备注")
+ @ExcelProperty("备注")
+ private String bz;
+
+ @ExcelIgnore
+ private Boolean qwbBs=false;
+
+ public boolean isAvailable(){
+ return !StrUtil.isAllEmpty(this.dcCh,this.dcPl,this.dcFd,this.sl,this.xcpw,this.pw,this.dbqgks,this.ykpkjs,this.lmqgks,this.lmqgjs,
+ this.ekskks,this.ekpkjs,this.skskqgks,this.skpkjs,this.ptks,this.ptjs,this.qpt_zjs,this.qptjs,
+ this.qwbjs,this.fbqgks,this.fbqgjs,this.skqgks,this.pkqgjs,this.mbjb,this.xcmb,this.fdxq,this.gdjs);
+ }
+}
diff --git a/src/main/java/com/dsic/gj_erp/bean/jhgk/excel/SyExcel.java b/src/main/java/com/dsic/gj_erp/bean/jhgk/excel/SyExcel.java
index 162df6c..92e7a6e 100644
--- a/src/main/java/com/dsic/gj_erp/bean/jhgk/excel/SyExcel.java
+++ b/src/main/java/com/dsic/gj_erp/bean/jhgk/excel/SyExcel.java
@@ -1,9 +1,7 @@
package com.dsic.gj_erp.bean.jhgk.excel;
import com.alibaba.excel.annotation.ExcelProperty;
-import com.alibaba.excel.annotation.format.DateTimeFormat;
import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
diff --git a/src/main/java/com/dsic/gj_erp/bean/jhgk/excel/ZrcAndPlb.java b/src/main/java/com/dsic/gj_erp/bean/jhgk/excel/ZrcAndPlb.java
new file mode 100644
index 0000000..6b88d0e
--- /dev/null
+++ b/src/main/java/com/dsic/gj_erp/bean/jhgk/excel/ZrcAndPlb.java
@@ -0,0 +1,42 @@
+package com.dsic.gj_erp.bean.jhgk.excel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class ZrcAndPlb {
+
+ @ExcelProperty(value = "批量号")
+ public String dcPl;
+
+ @ExcelProperty(value = "包含分段")
+ public String mfd;
+
+ @ExcelProperty(value = "吨位")
+ public String ton;
+
+ @ExcelProperty(value = "钢加结束")
+ public String gjjs;
+
+ @ExcelProperty(value = "钢加开始")
+ public String gjks;
+
+ @ExcelProperty(value = "套料图")
+ public String tlt;
+
+ @ExcelProperty(value = "板材领取表")
+ public String bclqb;
+
+ @ExcelProperty(value = "订货清单发放")
+ public String dhqd;
+
+ @ExcelProperty(value = "钢料到齐时间")
+ public String gldq;
+
+ @ExcelProperty(value = "备注")
+ public String bz;
+
+ public int dataOrder;
+}
diff --git a/src/main/java/com/dsic/gj_erp/bean/jiuzhou/Sljh.java b/src/main/java/com/dsic/gj_erp/bean/jiuzhou/Sljh.java
index 3ba8303..ad3f32c 100644
--- a/src/main/java/com/dsic/gj_erp/bean/jiuzhou/Sljh.java
+++ b/src/main/java/com/dsic/gj_erp/bean/jiuzhou/Sljh.java
@@ -7,8 +7,6 @@ import com.dsic.gj_erp.bean.jhgk.DmYdjh;
import lombok.Getter;
import lombok.Setter;
-import java.util.Random;
-
@Getter
@Setter
@TableName("im_slxx")
diff --git a/src/main/java/com/dsic/gj_erp/bean/jt/供应商管理.java b/src/main/java/com/dsic/gj_erp/bean/jt/供应商管理.java
new file mode 100644
index 0000000..ea4fb05
--- /dev/null
+++ b/src/main/java/com/dsic/gj_erp/bean/jt/供应商管理.java
@@ -0,0 +1,307 @@
+package com.dsic.gj_erp.bean.jt;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+/**
+ * 【请填写功能名称】对象 供应商管理
+ *
+ * @author ruoyi
+ * @date 2024-06-26
+ */
+public class 供应商管理{
+ private static final long serialVersionUID = 1L;
+
+ /** $column.columnComment */
+ private String 供应商编码;
+
+ /** $column.columnComment */
+ private String 供应商名称;
+
+ /** $column.columnComment */
+ private String 供应商分类;
+
+ /** $column.columnComment */
+ private String 供应商等级;
+
+ /** $column.columnComment */
+ private String 签约开始日期;
+
+ /** $column.columnComment */
+ private String 结算期限;
+
+ /** $column.columnComment */
+ private String 采购负责人;
+
+ /** $column.columnComment */
+ private String 签约结束日期;
+
+ /** $column.columnComment */
+ private Long 信用额度;
+
+ /** $column.columnComment */
+ private String 供应商地区;
+
+ /** $column.columnComment */
+ private String 具体地址;
+
+ /** $column.columnComment */
+ private String 合同附件;
+
+ /** $column.columnComment */
+ private String 发票抬头;
+
+ /** $column.columnComment */
+ private Long 发票税号;
+
+ /** $column.columnComment */
+ private String 税种;
+
+ /** $column.columnComment */
+ private Long 增值税税率;
+
+ /** $column.columnComment */
+ private String 开户银行;
+
+ /** $column.columnComment */
+ private String 银行账号;
+
+ /** $column.columnComment */
+ private String 创建时间;
+
+ /** $column.columnComment */
+ private String 创建用户;
+
+ /** $column.columnComment */
+ private String 最近修改时间;
+
+ /** $column.columnComment */
+ private String 修改用户;
+
+ public void set供应商编码(String 供应商编码)
+ {
+ this.供应商编码 = 供应商编码;
+ }
+
+ public String get供应商编码()
+ {
+ return 供应商编码;
+ }
+ public void set供应商名称(String 供应商名称)
+ {
+ this.供应商名称 = 供应商名称;
+ }
+
+ public String get供应商名称()
+ {
+ return 供应商名称;
+ }
+ public void set供应商分类(String 供应商分类)
+ {
+ this.供应商分类 = 供应商分类;
+ }
+
+ public String get供应商分类()
+ {
+ return 供应商分类;
+ }
+ public void set供应商等级(String 供应商等级)
+ {
+ this.供应商等级 = 供应商等级;
+ }
+
+ public String get供应商等级()
+ {
+ return 供应商等级;
+ }
+ public void set签约开始日期(String 签约开始日期)
+ {
+ this.签约开始日期 = 签约开始日期;
+ }
+
+ public String get签约开始日期()
+ {
+ return 签约开始日期;
+ }
+ public void set结算期限(String 结算期限)
+ {
+ this.结算期限 = 结算期限;
+ }
+
+ public String get结算期限()
+ {
+ return 结算期限;
+ }
+ public void set采购负责人(String 采购负责人)
+ {
+ this.采购负责人 = 采购负责人;
+ }
+
+ public String get采购负责人()
+ {
+ return 采购负责人;
+ }
+ public void set签约结束日期(String 签约结束日期)
+ {
+ this.签约结束日期 = 签约结束日期;
+ }
+
+ public String get签约结束日期()
+ {
+ return 签约结束日期;
+ }
+ public void set信用额度(Long 信用额度)
+ {
+ this.信用额度 = 信用额度;
+ }
+
+ public Long get信用额度()
+ {
+ return 信用额度;
+ }
+ public void set供应商地区(String 供应商地区)
+ {
+ this.供应商地区 = 供应商地区;
+ }
+
+ public String get供应商地区()
+ {
+ return 供应商地区;
+ }
+ public void set具体地址(String 具体地址)
+ {
+ this.具体地址 = 具体地址;
+ }
+
+ public String get具体地址()
+ {
+ return 具体地址;
+ }
+ public void set合同附件(String 合同附件)
+ {
+ this.合同附件 = 合同附件;
+ }
+
+ public String get合同附件()
+ {
+ return 合同附件;
+ }
+ public void set发票抬头(String 发票抬头)
+ {
+ this.发票抬头 = 发票抬头;
+ }
+
+ public String get发票抬头()
+ {
+ return 发票抬头;
+ }
+ public void set发票税号(Long 发票税号)
+ {
+ this.发票税号 = 发票税号;
+ }
+
+ public Long get发票税号()
+ {
+ return 发票税号;
+ }
+ public void set税种(String 税种)
+ {
+ this.税种 = 税种;
+ }
+
+ public String get税种()
+ {
+ return 税种;
+ }
+ public void set增值税税率(Long 增值税税率)
+ {
+ this.增值税税率 = 增值税税率;
+ }
+
+ public Long get增值税税率()
+ {
+ return 增值税税率;
+ }
+ public void set开户银行(String 开户银行)
+ {
+ this.开户银行 = 开户银行;
+ }
+
+ public String get开户银行()
+ {
+ return 开户银行;
+ }
+ public void set银行账号(String 银行账号)
+ {
+ this.银行账号 = 银行账号;
+ }
+
+ public String get银行账号()
+ {
+ return 银行账号;
+ }
+ public void set创建时间(String 创建时间)
+ {
+ this.创建时间 = 创建时间;
+ }
+
+ public String get创建时间()
+ {
+ return 创建时间;
+ }
+ public void set创建用户(String 创建用户)
+ {
+ this.创建用户 = 创建用户;
+ }
+
+ public String get创建用户()
+ {
+ return 创建用户;
+ }
+ public void set最近修改时间(String 最近修改时间)
+ {
+ this.最近修改时间 = 最近修改时间;
+ }
+
+ public String get最近修改时间()
+ {
+ return 最近修改时间;
+ }
+ public void set修改用户(String 修改用户)
+ {
+ this.修改用户 = 修改用户;
+ }
+
+ public String get修改用户()
+ {
+ return 修改用户;
+ }
+
+ @Override
+ public String toString() {
+ return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+ .append("供应商编码", get供应商编码())
+ .append("供应商名称", get供应商名称())
+ .append("供应商分类", get供应商分类())
+ .append("供应商等级", get供应商等级())
+ .append("签约开始日期", get签约开始日期())
+ .append("结算期限", get结算期限())
+ .append("采购负责人", get采购负责人())
+ .append("签约结束日期", get签约结束日期())
+ .append("信用额度", get信用额度())
+ .append("供应商地区", get供应商地区())
+ .append("具体地址", get具体地址())
+ .append("合同附件", get合同附件())
+ .append("发票抬头", get发票抬头())
+ .append("发票税号", get发票税号())
+ .append("税种", get税种())
+ .append("增值税税率%", get增值税税率())
+ .append("开户银行", get开户银行())
+ .append("银行账号", get银行账号())
+ .append("创建时间", get创建时间())
+ .append("创建用户", get创建用户())
+ .append("最近修改时间", get最近修改时间())
+ .append("修改用户", get修改用户())
+ .toString();
+ }
+}
diff --git a/src/main/java/com/dsic/gj_erp/bean/jt/入库.java b/src/main/java/com/dsic/gj_erp/bean/jt/入库.java
new file mode 100644
index 0000000..6c62e9f
--- /dev/null
+++ b/src/main/java/com/dsic/gj_erp/bean/jt/入库.java
@@ -0,0 +1,203 @@
+package com.dsic.gj_erp.bean.jt;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+/**
+ * 【请填写功能名称】对象 入库
+ *
+ * @author ruoyi
+ * @date 2024-06-26
+ */
+public class 入库{
+ private static final long serialVersionUID = 1L;
+
+ /** $column.columnComment */
+ private String 选择采购订单;
+
+ /** $column.columnComment */
+ private String 采购入库单编号;
+
+ /** $column.columnComment */
+ private String 入库仓库;
+
+ /** $column.columnComment */
+ private Long 入库产品总数;
+
+ /** $column.columnComment */
+ private String 是否存在不合格品;
+
+ /** $column.columnComment */
+ private String 合格品入库确认;
+
+ /** $column.columnComment */
+ private Long 入库产品采购价总额;
+
+ /** $column.columnComment */
+ private String 质检时间;
+
+ /** $column.columnComment */
+ private String 质检员;
+
+ /** $column.columnComment */
+ private String 入库时间;
+
+ /** $column.columnComment */
+ private String 入库员;
+
+ /** $column.columnComment */
+ private String 创建时间;
+
+ /** $column.columnComment */
+ private String 创建用户;
+
+ /** $column.columnComment */
+ private String 修改用户;
+
+ public void set选择采购订单(String 选择采购订单)
+ {
+ this.选择采购订单 = 选择采购订单;
+ }
+
+ public String get选择采购订单()
+ {
+ return 选择采购订单;
+ }
+ public void set采购入库单编号(String 采购入库单编号)
+ {
+ this.采购入库单编号 = 采购入库单编号;
+ }
+
+ public String get采购入库单编号()
+ {
+ return 采购入库单编号;
+ }
+ public void set入库仓库(String 入库仓库)
+ {
+ this.入库仓库 = 入库仓库;
+ }
+
+ public String get入库仓库()
+ {
+ return 入库仓库;
+ }
+ public void set入库产品总数(Long 入库产品总数)
+ {
+ this.入库产品总数 = 入库产品总数;
+ }
+
+ public Long get入库产品总数()
+ {
+ return 入库产品总数;
+ }
+ public void set是否存在不合格品(String 是否存在不合格品)
+ {
+ this.是否存在不合格品 = 是否存在不合格品;
+ }
+
+ public String get是否存在不合格品()
+ {
+ return 是否存在不合格品;
+ }
+ public void set合格品入库确认(String 合格品入库确认)
+ {
+ this.合格品入库确认 = 合格品入库确认;
+ }
+
+ public String get合格品入库确认()
+ {
+ return 合格品入库确认;
+ }
+ public void set入库产品采购价总额(Long 入库产品采购价总额)
+ {
+ this.入库产品采购价总额 = 入库产品采购价总额;
+ }
+
+ public Long get入库产品采购价总额()
+ {
+ return 入库产品采购价总额;
+ }
+ public void set质检时间(String 质检时间)
+ {
+ this.质检时间 = 质检时间;
+ }
+
+ public String get质检时间()
+ {
+ return 质检时间;
+ }
+ public void set质检员(String 质检员)
+ {
+ this.质检员 = 质检员;
+ }
+
+ public String get质检员()
+ {
+ return 质检员;
+ }
+ public void set入库时间(String 入库时间)
+ {
+ this.入库时间 = 入库时间;
+ }
+
+ public String get入库时间()
+ {
+ return 入库时间;
+ }
+ public void set入库员(String 入库员)
+ {
+ this.入库员 = 入库员;
+ }
+
+ public String get入库员()
+ {
+ return 入库员;
+ }
+ public void set创建时间(String 创建时间)
+ {
+ this.创建时间 = 创建时间;
+ }
+
+ public String get创建时间()
+ {
+ return 创建时间;
+ }
+ public void set创建用户(String 创建用户)
+ {
+ this.创建用户 = 创建用户;
+ }
+
+ public String get创建用户()
+ {
+ return 创建用户;
+ }
+ public void set修改用户(String 修改用户)
+ {
+ this.修改用户 = 修改用户;
+ }
+
+ public String get修改用户()
+ {
+ return 修改用户;
+ }
+
+ @Override
+ public String toString() {
+ return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+ .append("选择采购订单", get选择采购订单())
+ .append("采购入库单编号", get采购入库单编号())
+ .append("入库仓库", get入库仓库())
+ .append("入库产品总数", get入库产品总数())
+ .append("是否存在不合格品", get是否存在不合格品())
+ .append("合格品入库确认", get合格品入库确认())
+ .append("入库产品采购价总额(含税)/元", get入库产品采购价总额())
+ .append("质检时间", get质检时间())
+ .append("质检员", get质检员())
+ .append("入库时间", get入库时间())
+ .append("入库员", get入库员())
+ .append("创建时间", get创建时间())
+ .append("创建用户", get创建用户())
+ .append("修改用户", get修改用户())
+ .toString();
+ }
+}
diff --git a/src/main/java/com/dsic/gj_erp/bean/jt/出库.java b/src/main/java/com/dsic/gj_erp/bean/jt/出库.java
new file mode 100644
index 0000000..a87b8a5
--- /dev/null
+++ b/src/main/java/com/dsic/gj_erp/bean/jt/出库.java
@@ -0,0 +1,216 @@
+package com.dsic.gj_erp.bean.jt;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+/**
+ * 【请填写功能名称】对象 出库
+ *
+ * @author ruoyi
+ * @date 2024-06-26
+ */
+public class 出库 {
+ private static final long serialVersionUID = 1L;
+
+ /** $column.columnComment */
+ private String 选择销售订单;
+
+ /** $column.columnComment */
+ private String 产品出库标签;
+
+ /** $column.columnComment */
+ private String 出库仓库;
+
+ /** $column.columnComment */
+ private String 预计出库时间;
+
+ /** $column.columnComment */
+ private String 销售订单名称;
+
+ /** $column.columnComment */
+ private String 客户名称;
+
+ /** $column.columnComment */
+ private Long 出库产品总数;
+
+ /** $column.columnComment */
+ private Long 出库产品售价总额;
+
+ /** $column.columnComment */
+ private String 出库员;
+
+ /** $column.columnComment */
+ private String 客户收货确认;
+
+ /** $column.columnComment */
+ private String 收货确认时间;
+
+ /** $column.columnComment */
+ private String 创建时间;
+
+ /** $column.columnComment */
+ private String 创建用户;
+
+ /** $column.columnComment */
+ private String 最近修改时间;
+
+ /** $column.columnComment */
+ private String 修改用户;
+
+ public void set选择销售订单(String 选择销售订单)
+ {
+ this.选择销售订单 = 选择销售订单;
+ }
+
+ public String get选择销售订单()
+ {
+ return 选择销售订单;
+ }
+ public void set产品出库标签(String 产品出库标签)
+ {
+ this.产品出库标签 = 产品出库标签;
+ }
+
+ public String get产品出库标签()
+ {
+ return 产品出库标签;
+ }
+ public void set出库仓库(String 出库仓库)
+ {
+ this.出库仓库 = 出库仓库;
+ }
+
+ public String get出库仓库()
+ {
+ return 出库仓库;
+ }
+ public void set预计出库时间(String 预计出库时间)
+ {
+ this.预计出库时间 = 预计出库时间;
+ }
+
+ public String get预计出库时间()
+ {
+ return 预计出库时间;
+ }
+ public void set销售订单名称(String 销售订单名称)
+ {
+ this.销售订单名称 = 销售订单名称;
+ }
+
+ public String get销售订单名称()
+ {
+ return 销售订单名称;
+ }
+ public void set客户名称(String 客户名称)
+ {
+ this.客户名称 = 客户名称;
+ }
+
+ public String get客户名称()
+ {
+ return 客户名称;
+ }
+ public void set出库产品总数(Long 出库产品总数)
+ {
+ this.出库产品总数 = 出库产品总数;
+ }
+
+ public Long get出库产品总数()
+ {
+ return 出库产品总数;
+ }
+ public void set出库产品售价总额(Long 出库产品售价总额)
+ {
+ this.出库产品售价总额 = 出库产品售价总额;
+ }
+
+ public Long get出库产品售价总额()
+ {
+ return 出库产品售价总额;
+ }
+ public void set出库员(String 出库员)
+ {
+ this.出库员 = 出库员;
+ }
+
+ public String get出库员()
+ {
+ return 出库员;
+ }
+ public void set客户收货确认(String 客户收货确认)
+ {
+ this.客户收货确认 = 客户收货确认;
+ }
+
+ public String get客户收货确认()
+ {
+ return 客户收货确认;
+ }
+ public void set收货确认时间(String 收货确认时间)
+ {
+ this.收货确认时间 = 收货确认时间;
+ }
+
+ public String get收货确认时间()
+ {
+ return 收货确认时间;
+ }
+ public void set创建时间(String 创建时间)
+ {
+ this.创建时间 = 创建时间;
+ }
+
+ public String get创建时间()
+ {
+ return 创建时间;
+ }
+ public void set创建用户(String 创建用户)
+ {
+ this.创建用户 = 创建用户;
+ }
+
+ public String get创建用户()
+ {
+ return 创建用户;
+ }
+ public void set最近修改时间(String 最近修改时间)
+ {
+ this.最近修改时间 = 最近修改时间;
+ }
+
+ public String get最近修改时间()
+ {
+ return 最近修改时间;
+ }
+ public void set修改用户(String 修改用户)
+ {
+ this.修改用户 = 修改用户;
+ }
+
+ public String get修改用户()
+ {
+ return 修改用户;
+ }
+
+ @Override
+ public String toString() {
+ return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+ .append("选择销售订单", get选择销售订单())
+ .append("产品出库标签", get产品出库标签())
+ .append("出库仓库", get出库仓库())
+ .append("预计出库时间", get预计出库时间())
+ .append("销售订单名称", get销售订单名称())
+ .append("客户名称", get客户名称())
+ .append("出库产品总数", get出库产品总数())
+ .append("出库产品售价总额(含税)/元", get出库产品售价总额())
+ .append("出库员", get出库员())
+ .append("客户收货确认", get客户收货确认())
+ .append("收货确认时间", get收货确认时间())
+ .append("创建时间", get创建时间())
+ .append("创建用户", get创建用户())
+ .append("最近修改时间", get最近修改时间())
+ .append("修改用户", get修改用户())
+ .toString();
+ }
+}
diff --git a/src/main/java/com/dsic/gj_erp/bean/jt/发票管理.java b/src/main/java/com/dsic/gj_erp/bean/jt/发票管理.java
new file mode 100644
index 0000000..be3b889
--- /dev/null
+++ b/src/main/java/com/dsic/gj_erp/bean/jt/发票管理.java
@@ -0,0 +1,177 @@
+package com.dsic.gj_erp.bean.jt;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+/**
+ * 【请填写功能名称】对象 发票管理
+ *
+ * @author ruoyi
+ * @date 2024-06-26
+ */
+public class 发票管理 {
+ private static final long serialVersionUID = 1L;
+
+ /** 选择对账单 */
+ private String 选择对账单;
+
+ /** 发票金额含税 */
+ private String 发票金额含税;
+
+ /** 待开票金额含税元 */
+ private String 待开票金额含税元;
+
+ /** 累计开票金额含税 */
+ private String 累计开票金额含税;
+
+ /** 发票类型 */
+ private String 发票类型;
+
+ /** 发票号码 */
+ private String 发票号码;
+
+ /** 开票时间 */
+ private String 开票时间;
+
+ /** 发票抬头 */
+ private String 发票抬头;
+
+ /** 发票税号 */
+ private String 发票税号;
+
+ /** 税种 */
+ private String 税种;
+
+ /** 经办人 */
+ private String 经办人;
+
+ /** 归属部门 */
+ private String 归属部门;
+
+ public void set选择对账单(String 选择对账单)
+ {
+ this.选择对账单 = 选择对账单;
+ }
+
+ public String get选择对账单()
+ {
+ return 选择对账单;
+ }
+ public void set发票金额含税(String 发票金额含税)
+ {
+ this.发票金额含税 = 发票金额含税;
+ }
+
+ public String get发票金额含税()
+ {
+ return 发票金额含税;
+ }
+ public void set待开票金额含税元(String 待开票金额含税元)
+ {
+ this.待开票金额含税元 = 待开票金额含税元;
+ }
+
+ public String get待开票金额含税元()
+ {
+ return 待开票金额含税元;
+ }
+ public void set累计开票金额含税(String 累计开票金额含税)
+ {
+ this.累计开票金额含税 = 累计开票金额含税;
+ }
+
+ public String get累计开票金额含税()
+ {
+ return 累计开票金额含税;
+ }
+ public void set发票类型(String 发票类型)
+ {
+ this.发票类型 = 发票类型;
+ }
+
+ public String get发票类型()
+ {
+ return 发票类型;
+ }
+ public void set发票号码(String 发票号码)
+ {
+ this.发票号码 = 发票号码;
+ }
+
+ public String get发票号码()
+ {
+ return 发票号码;
+ }
+ public void set开票时间(String 开票时间)
+ {
+ this.开票时间 = 开票时间;
+ }
+
+ public String get开票时间()
+ {
+ return 开票时间;
+ }
+ public void set发票抬头(String 发票抬头)
+ {
+ this.发票抬头 = 发票抬头;
+ }
+
+ public String get发票抬头()
+ {
+ return 发票抬头;
+ }
+ public void set发票税号(String 发票税号)
+ {
+ this.发票税号 = 发票税号;
+ }
+
+ public String get发票税号()
+ {
+ return 发票税号;
+ }
+ public void set税种(String 税种)
+ {
+ this.税种 = 税种;
+ }
+
+ public String get税种()
+ {
+ return 税种;
+ }
+ public void set经办人(String 经办人)
+ {
+ this.经办人 = 经办人;
+ }
+
+ public String get经办人()
+ {
+ return 经办人;
+ }
+ public void set归属部门(String 归属部门)
+ {
+ this.归属部门 = 归属部门;
+ }
+
+ public String get归属部门()
+ {
+ return 归属部门;
+ }
+
+ @Override
+ public String toString() {
+ return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+ .append("选择对账单", get选择对账单())
+ .append("发票金额含税", get发票金额含税())
+ .append("待开票金额含税元", get待开票金额含税元())
+ .append("累计开票金额含税", get累计开票金额含税())
+ .append("发票类型", get发票类型())
+ .append("发票号码", get发票号码())
+ .append("开票时间", get开票时间())
+ .append("发票抬头", get发票抬头())
+ .append("发票税号", get发票税号())
+ .append("税种", get税种())
+ .append("经办人", get经办人())
+ .append("归属部门", get归属部门())
+ .toString();
+ }
+}
diff --git a/src/main/java/com/dsic/gj_erp/bean/jt/应付账款.java b/src/main/java/com/dsic/gj_erp/bean/jt/应付账款.java
new file mode 100644
index 0000000..4b75cdd
--- /dev/null
+++ b/src/main/java/com/dsic/gj_erp/bean/jt/应付账款.java
@@ -0,0 +1,190 @@
+package com.dsic.gj_erp.bean.jt;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+/**
+ * 【请填写功能名称】对象 应付账款
+ *
+ * @author ruoyi
+ * @date 2024-06-26
+ */
+public class 应付账款{
+ private static final long serialVersionUID = 1L;
+
+ /** $column.columnComment */
+ private String 产品名称;
+
+ /** $column.columnComment */
+ private String 单位;
+
+ /** $column.columnComment */
+ private Long 采购数量;
+
+ /** $column.columnComment */
+ private Long 实际采购价含税;
+
+ /** $column.columnComment */
+ private Long 实际采购价不含税;
+
+ /** $column.columnComment */
+ private String 应付状态;
+
+ /** $column.columnComment */
+ private Long 应付金额;
+
+ /** $column.columnComment */
+ private String 应付对账时间;
+
+ /** $column.columnComment */
+ private String 付款状态;
+
+ /** $column.columnComment */
+ private Long 付款金额;
+
+ /** $column.columnComment */
+ private String 付款时间;
+
+ /** $column.columnComment */
+ private Long 采购入库单;
+
+ /** $column.columnComment */
+ private Long 本次入库总数;
+
+ public void set产品名称(String 产品名称)
+ {
+ this.产品名称 = 产品名称;
+ }
+
+ public String get产品名称()
+ {
+ return 产品名称;
+ }
+ public void set单位(String 单位)
+ {
+ this.单位 = 单位;
+ }
+
+ public String get单位()
+ {
+ return 单位;
+ }
+ public void set采购数量(Long 采购数量)
+ {
+ this.采购数量 = 采购数量;
+ }
+
+ public Long get采购数量()
+ {
+ return 采购数量;
+ }
+ public void set实际采购价(Long 实际采购价)
+ {
+ this.实际采购价含税 = 实际采购价;
+ }
+
+ public Long get实际采购价含税()
+ {
+ return 实际采购价含税;
+ }
+ public void set实际采购价不含税(Long 实际采购价不含税)
+ {
+ this.实际采购价不含税 = 实际采购价不含税;
+ }
+
+ public Long get实际采购价不含税()
+ {
+ return 实际采购价不含税;
+ }
+ public void set应付状态(String 应付状态)
+ {
+ this.应付状态 = 应付状态;
+ }
+
+ public String get应付状态()
+ {
+ return 应付状态;
+ }
+ public void set应付金额(Long 应付金额)
+ {
+ this.应付金额 = 应付金额;
+ }
+
+ public Long get应付金额()
+ {
+ return 应付金额;
+ }
+ public void set应付对账时间(String 应付对账时间)
+ {
+ this.应付对账时间 = 应付对账时间;
+ }
+
+ public String get应付对账时间()
+ {
+ return 应付对账时间;
+ }
+ public void set付款状态(String 付款状态)
+ {
+ this.付款状态 = 付款状态;
+ }
+
+ public String get付款状态()
+ {
+ return 付款状态;
+ }
+ public void set付款金额(Long 付款金额)
+ {
+ this.付款金额 = 付款金额;
+ }
+
+ public Long get付款金额()
+ {
+ return 付款金额;
+ }
+ public void set付款时间(String 付款时间)
+ {
+ this.付款时间 = 付款时间;
+ }
+
+ public String get付款时间()
+ {
+ return 付款时间;
+ }
+ public void set采购入库单(Long 采购入库单)
+ {
+ this.采购入库单 = 采购入库单;
+ }
+
+ public Long get采购入库单()
+ {
+ return 采购入库单;
+ }
+ public void set本次入库总数(Long 本次入库总数)
+ {
+ this.本次入库总数 = 本次入库总数;
+ }
+
+ public Long get本次入库总数()
+ {
+ return 本次入库总数;
+ }
+
+ @Override
+ public String toString() {
+ return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+ .append("产品名称", get产品名称())
+ .append("单位", get单位())
+ .append("采购数量", get采购数量())
+ .append("实际采购价(含税)/元", get实际采购价含税())
+ .append("实际采购价(不含税)/元", get实际采购价不含税())
+ .append("应付状态", get应付状态())
+ .append("应付金额/元", get应付金额())
+ .append("应付对账时间", get应付对账时间())
+ .append("付款状态", get付款状态())
+ .append("付款金额/元", get付款金额())
+ .append("付款时间", get付款时间())
+ .append("采购入库单", get采购入库单())
+ .append("本次入库总数", get本次入库总数())
+ .toString();
+ }
+}
diff --git a/src/main/java/com/dsic/gj_erp/bean/jt/应收账款.java b/src/main/java/com/dsic/gj_erp/bean/jt/应收账款.java
new file mode 100644
index 0000000..3922d1c
--- /dev/null
+++ b/src/main/java/com/dsic/gj_erp/bean/jt/应收账款.java
@@ -0,0 +1,190 @@
+package com.dsic.gj_erp.bean.jt;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+/**
+ * 【请填写功能名称】对象 应收账款
+ *
+ * @author ruoyi
+ * @date 2024-06-26
+ */
+public class 应收账款{
+ private static final long serialVersionUID = 1L;
+
+ /** $column.columnComment */
+ private String 销售出库单;
+
+ /** $column.columnComment */
+ private String 产品名称;
+
+ /** $column.columnComment */
+ private String 单位;
+
+ /** $column.columnComment */
+ private Long 销售数量;
+
+ /** $column.columnComment */
+ private Long 本次出库总数;
+
+ /** $column.columnComment */
+ private Long 实际售价含税;
+
+ /** $column.columnComment */
+ private Long 实际售价不含税;
+
+ /** $column.columnComment */
+ private String 应收状态;
+
+ /** $column.columnComment */
+ private Long 应收金额;
+
+ /** $column.columnComment */
+ private String 应收对账时间;
+
+ /** $column.columnComment */
+ private String 收款状态;
+
+ /** $column.columnComment */
+ private Long 收款金额;
+
+ /** $column.columnComment */
+ private String 收款时间;
+
+ public void set销售出库单(String 销售出库单)
+ {
+ this.销售出库单 = 销售出库单;
+ }
+
+ public String get销售出库单()
+ {
+ return 销售出库单;
+ }
+ public void set产品名称(String 产品名称)
+ {
+ this.产品名称 = 产品名称;
+ }
+
+ public String get产品名称()
+ {
+ return 产品名称;
+ }
+ public void set单位(String 单位)
+ {
+ this.单位 = 单位;
+ }
+
+ public String get单位()
+ {
+ return 单位;
+ }
+ public void set销售数量(Long 销售数量)
+ {
+ this.销售数量 = 销售数量;
+ }
+
+ public Long get销售数量()
+ {
+ return 销售数量;
+ }
+ public void set本次出库总数(Long 本次出库总数)
+ {
+ this.本次出库总数 = 本次出库总数;
+ }
+
+ public Long get本次出库总数()
+ {
+ return 本次出库总数;
+ }
+ public void set实际售价含税(Long 实际售价含税)
+ {
+ this.实际售价含税 = 实际售价含税;
+ }
+
+ public Long get实际售价含税()
+ {
+ return 实际售价含税;
+ }
+ public void set实际售价不含税(Long 实际售价不含税)
+ {
+ this.实际售价不含税 = 实际售价不含税;
+ }
+
+ public Long get实际售价不含税()
+ {
+ return 实际售价不含税;
+ }
+ public void set应收状态(String 应收状态)
+ {
+ this.应收状态 = 应收状态;
+ }
+
+ public String get应收状态()
+ {
+ return 应收状态;
+ }
+ public void set应收金额(Long 应收金额)
+ {
+ this.应收金额 = 应收金额;
+ }
+
+ public Long get应收金额()
+ {
+ return 应收金额;
+ }
+ public void set应收对账时间(String 应收对账时间)
+ {
+ this.应收对账时间 = 应收对账时间;
+ }
+
+ public String get应收对账时间()
+ {
+ return 应收对账时间;
+ }
+ public void set收款状态(String 收款状态)
+ {
+ this.收款状态 = 收款状态;
+ }
+
+ public String get收款状态()
+ {
+ return 收款状态;
+ }
+ public void set收款金额(Long 收款金额)
+ {
+ this.收款金额 = 收款金额;
+ }
+
+ public Long get收款金额()
+ {
+ return 收款金额;
+ }
+ public void set收款时间(String 收款时间)
+ {
+ this.收款时间 = 收款时间;
+ }
+
+ public String get收款时间()
+ {
+ return 收款时间;
+ }
+
+ @Override
+ public String toString() {
+ return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+ .append("销售出库单", get销售出库单())
+ .append("产品名称", get产品名称())
+ .append("单位", get单位())
+ .append("销售数量", get销售数量())
+ .append("本次出库总数", get本次出库总数())
+ .append("实际售价(含税)/元", get实际售价含税())
+ .append("实际售价(不含税)/元", get实际售价不含税())
+ .append("应收状态", get应收状态())
+ .append("应收金额/元", get应收金额())
+ .append("应收对账时间", get应收对账时间())
+ .append("收款状态", get收款状态())
+ .append("收款金额", get收款金额())
+ .append("收款时间", get收款时间())
+ .toString();
+ }
+}
diff --git a/src/main/java/com/dsic/gj_erp/bean/jt/盘点.java b/src/main/java/com/dsic/gj_erp/bean/jt/盘点.java
new file mode 100644
index 0000000..f6edc2c
--- /dev/null
+++ b/src/main/java/com/dsic/gj_erp/bean/jt/盘点.java
@@ -0,0 +1,190 @@
+package com.dsic.gj_erp.bean.jt;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+/**
+ * 【请填写功能名称】对象 盘点
+ *
+ * @author ruoyi
+ * @date 2024-06-26
+ */
+public class 盘点{
+ private static final long serialVersionUID = 1L;
+
+ /** $column.columnComment */
+ private String 盘点类型;
+
+ /** $column.columnComment */
+ private String 盘点单编号;
+
+ /** $column.columnComment */
+ private String 盘点开始日期;
+
+ /** $column.columnComment */
+ private String 盘点结束日期;
+
+ /** $column.columnComment */
+ private String 盘点仓库;
+
+ /** $column.columnComment */
+ private String 盘点员;
+
+ /** $column.columnComment */
+ private Long 盘亏产品总数;
+
+ /** $column.columnComment */
+ private Long 盘亏产品售价总额含税;
+
+ /** $column.columnComment */
+ private Long 盘盈产品总数;
+
+ /** $column.columnComment */
+ private Long 盘盈产品售价总额含税;
+
+ /** $column.columnComment */
+ private String 创建时间;
+
+ /** $column.columnComment */
+ private String 创建用户;
+
+ /** $column.columnComment */
+ private String 最近修改时间;
+
+ public void set盘点类型(String 盘点类型)
+ {
+ this.盘点类型 = 盘点类型;
+ }
+
+ public String get盘点类型()
+ {
+ return 盘点类型;
+ }
+ public void set盘点单编号(String 盘点单编号)
+ {
+ this.盘点单编号 = 盘点单编号;
+ }
+
+ public String get盘点单编号()
+ {
+ return 盘点单编号;
+ }
+ public void set盘点开始日期(String 盘点开始日期)
+ {
+ this.盘点开始日期 = 盘点开始日期;
+ }
+
+ public String get盘点开始日期()
+ {
+ return 盘点开始日期;
+ }
+ public void set盘点结束日期(String 盘点结束日期)
+ {
+ this.盘点结束日期 = 盘点结束日期;
+ }
+
+ public String get盘点结束日期()
+ {
+ return 盘点结束日期;
+ }
+ public void set盘点仓库(String 盘点仓库)
+ {
+ this.盘点仓库 = 盘点仓库;
+ }
+
+ public String get盘点仓库()
+ {
+ return 盘点仓库;
+ }
+ public void set盘点员(String 盘点员)
+ {
+ this.盘点员 = 盘点员;
+ }
+
+ public String get盘点员()
+ {
+ return 盘点员;
+ }
+ public void set盘亏产品总数(Long 盘亏产品总数)
+ {
+ this.盘亏产品总数 = 盘亏产品总数;
+ }
+
+ public Long get盘亏产品总数()
+ {
+ return 盘亏产品总数;
+ }
+ public void set盘亏产品售价总额含税(Long 盘亏产品售价总额含税)
+ {
+ this.盘亏产品售价总额含税 = 盘亏产品售价总额含税;
+ }
+
+ public Long get盘亏产品售价总额含税()
+ {
+ return 盘亏产品售价总额含税;
+ }
+ public void set盘盈产品总数(Long 盘盈产品总数)
+ {
+ this.盘盈产品总数 = 盘盈产品总数;
+ }
+
+ public Long get盘盈产品总数()
+ {
+ return 盘盈产品总数;
+ }
+ public void set盘盈产品售价总额含税(Long 盘盈产品售价总额含税)
+ {
+ this.盘盈产品售价总额含税 = 盘盈产品售价总额含税;
+ }
+
+ public Long get盘盈产品售价总额含税()
+ {
+ return 盘盈产品售价总额含税;
+ }
+ public void set创建时间(String 创建时间)
+ {
+ this.创建时间 = 创建时间;
+ }
+
+ public String get创建时间()
+ {
+ return 创建时间;
+ }
+ public void set创建用户(String 创建用户)
+ {
+ this.创建用户 = 创建用户;
+ }
+
+ public String get创建用户()
+ {
+ return 创建用户;
+ }
+ public void set最近修改时间(String 最近修改时间)
+ {
+ this.最近修改时间 = 最近修改时间;
+ }
+
+ public String get最近修改时间()
+ {
+ return 最近修改时间;
+ }
+
+ @Override
+ public String toString() {
+ return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+ .append("盘点类型", get盘点类型())
+ .append("盘点单编号", get盘点单编号())
+ .append("盘点开始日期", get盘点开始日期())
+ .append("盘点结束日期", get盘点结束日期())
+ .append("盘点仓库", get盘点仓库())
+ .append("盘点员", get盘点员())
+ .append("盘亏产品总数", get盘亏产品总数())
+ .append("盘亏产品售价总额(含税)/元", get盘亏产品售价总额含税())
+ .append("盘盈产品总数", get盘盈产品总数())
+ .append("盘盈产品售价总额(含税)/元", get盘盈产品售价总额含税())
+ .append("创建时间", get创建时间())
+ .append("创建用户", get创建用户())
+ .append("最近修改时间", get最近修改时间())
+ .toString();
+ }
+}
diff --git a/src/main/java/com/dsic/gj_erp/bean/jt/退货.java b/src/main/java/com/dsic/gj_erp/bean/jt/退货.java
new file mode 100644
index 0000000..00012c1
--- /dev/null
+++ b/src/main/java/com/dsic/gj_erp/bean/jt/退货.java
@@ -0,0 +1,229 @@
+package com.dsic.gj_erp.bean.jt;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+/**
+ * 【请填写功能名称】对象 退货
+ *
+ * @author ruoyi
+ * @date 2024-06-26
+ */
+public class 退货{
+ private static final long serialVersionUID = 1L;
+
+ /** $column.columnComment */
+ private String 客户名称;
+
+ /** $column.columnComment */
+ private String 退货申请日期;
+
+ /** $column.columnComment */
+ private String 采购退货单编号;
+
+ /** $column.columnComment */
+ private String 选择采购订单;
+
+ /** $column.columnComment */
+ private String 退货原因;
+
+ /** $column.columnComment */
+ private String 退货仓库;
+
+ /** $column.columnComment */
+ private String 经办人;
+
+ /** $column.columnComment */
+ private Long 退货产品总数;
+
+ /** $column.columnComment */
+ private Long 退货产品采购价总额含税;
+
+ /** $column.columnComment */
+ private Long 已入库退货产品总数;
+
+ /** $column.columnComment */
+ private Long 已入库退货产品售价总额含税;
+
+ /** $column.columnComment */
+ private String 产品退回确认;
+
+ /** $column.columnComment */
+ private String 退货处理时间;
+
+ /** $column.columnComment */
+ private String 创建时间;
+
+ /** $column.columnComment */
+ private String 创建用户;
+
+ /** $column.columnComment */
+ private String 最近修改时间;
+
+ public void set客户名称(String 客户名称)
+ {
+ this.客户名称 = 客户名称;
+ }
+
+ public String get客户名称()
+ {
+ return 客户名称;
+ }
+ public void set退货申请日期(String 退货申请日期)
+ {
+ this.退货申请日期 = 退货申请日期;
+ }
+
+ public String get退货申请日期()
+ {
+ return 退货申请日期;
+ }
+ public void set采购退货单编号(String 采购退货单编号)
+ {
+ this.采购退货单编号 = 采购退货单编号;
+ }
+
+ public String get采购退货单编号()
+ {
+ return 采购退货单编号;
+ }
+ public void set选择采购订单(String 选择采购订单)
+ {
+ this.选择采购订单 = 选择采购订单;
+ }
+
+ public String get选择采购订单()
+ {
+ return 选择采购订单;
+ }
+ public void set退货原因(String 退货原因)
+ {
+ this.退货原因 = 退货原因;
+ }
+
+ public String get退货原因()
+ {
+ return 退货原因;
+ }
+ public void set退货仓库(String 退货仓库)
+ {
+ this.退货仓库 = 退货仓库;
+ }
+
+ public String get退货仓库()
+ {
+ return 退货仓库;
+ }
+ public void set经办人(String 经办人)
+ {
+ this.经办人 = 经办人;
+ }
+
+ public String get经办人()
+ {
+ return 经办人;
+ }
+ public void set退货产品总数(Long 退货产品总数)
+ {
+ this.退货产品总数 = 退货产品总数;
+ }
+
+ public Long get退货产品总数()
+ {
+ return 退货产品总数;
+ }
+ public void set退货产品采购价总额含税(Long 退货产品采购价总额含税)
+ {
+ this.退货产品采购价总额含税 = 退货产品采购价总额含税;
+ }
+
+ public Long get退货产品采购价总额含税()
+ {
+ return 退货产品采购价总额含税;
+ }
+ public void set已入库退货产品总数(Long 已入库退货产品总数)
+ {
+ this.已入库退货产品总数 = 已入库退货产品总数;
+ }
+
+ public Long get已入库退货产品总数()
+ {
+ return 已入库退货产品总数;
+ }
+ public void set已入库退货产品售价总额含税(Long 已入库退货产品售价总额含税)
+ {
+ this.已入库退货产品售价总额含税 = 已入库退货产品售价总额含税;
+ }
+
+ public Long get已入库退货产品售价总额含税()
+ {
+ return 已入库退货产品售价总额含税;
+ }
+ public void set产品退回确认(String 产品退回确认)
+ {
+ this.产品退回确认 = 产品退回确认;
+ }
+
+ public String get产品退回确认()
+ {
+ return 产品退回确认;
+ }
+ public void set退货处理时间(String 退货处理时间)
+ {
+ this.退货处理时间 = 退货处理时间;
+ }
+
+ public String get退货处理时间()
+ {
+ return 退货处理时间;
+ }
+ public void set创建时间(String 创建时间)
+ {
+ this.创建时间 = 创建时间;
+ }
+
+ public String get创建时间()
+ {
+ return 创建时间;
+ }
+ public void set创建用户(String 创建用户)
+ {
+ this.创建用户 = 创建用户;
+ }
+
+ public String get创建用户()
+ {
+ return 创建用户;
+ }
+ public void set最近修改时间(String 最近修改时间)
+ {
+ this.最近修改时间 = 最近修改时间;
+ }
+
+ public String get最近修改时间()
+ {
+ return 最近修改时间;
+ }
+
+ @Override
+ public String toString() {
+ return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+ .append("客户名称", get客户名称())
+ .append("退货申请日期", get退货申请日期())
+ .append("采购退货单编号", get采购退货单编号())
+ .append("选择采购订单", get选择采购订单())
+ .append("退货原因", get退货原因())
+ .append("退货仓库", get退货仓库())
+ .append("经办人", get经办人())
+ .append("退货产品总数", get退货产品总数())
+ .append("退货产品采购价总额(含税)/元", get退货产品采购价总额含税())
+ .append("已入库-退货产品总数", get已入库退货产品总数())
+ .append("已入库-退货产品售价总额(含税)/元", get已入库退货产品售价总额含税())
+ .append("产品退回确认", get产品退回确认())
+ .append("退货处理时间", get退货处理时间())
+ .append("创建时间", get创建时间())
+ .append("创建用户", get创建用户())
+ .append("最近修改时间", get最近修改时间())
+ .toString();
+ }
+}
diff --git a/src/main/java/com/dsic/gj_erp/bean/jt/采购订单.java b/src/main/java/com/dsic/gj_erp/bean/jt/采购订单.java
new file mode 100644
index 0000000..6849aab
--- /dev/null
+++ b/src/main/java/com/dsic/gj_erp/bean/jt/采购订单.java
@@ -0,0 +1,268 @@
+package com.dsic.gj_erp.bean.jt;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+/**
+ * 【请填写功能名称】对象 采购订单
+ *
+ * @author ruoyi
+ * @date 2024-06-26
+ */
+public class 采购订单{
+ private static final long serialVersionUID = 1L;
+
+ /** $column.columnComment */
+ private String 选择供应商;
+
+ /** $column.columnComment */
+ private String 订单签订日期;
+
+ /** $column.columnComment */
+ private String 采购订单名称;
+
+ /** $column.columnComment */
+ private String 订单交付日期;
+
+ /** $column.columnComment */
+ private String 采购负责人;
+
+ /** $column.columnComment */
+ private String 入库仓库;
+
+ /** $column.columnComment */
+ private Long 采购原价总额含税;
+
+ /** $column.columnComment */
+ private Long 优惠金额;
+
+ /** $column.columnComment */
+ private Long 整单折扣率;
+
+ /** $column.columnComment */
+ private Long 采购订单金额含税;
+
+ /** $column.columnComment */
+ private Long 采购金额合计不含税;
+
+ /** $column.columnComment */
+ private String 合同附件上传;
+
+ /** $column.columnComment */
+ private String 到货地址;
+
+ /** $column.columnComment */
+ private String 具体地址;
+
+ /** $column.columnComment */
+ private String 结算期限;
+
+ /** $column.columnComment */
+ private String 创建时间;
+
+ /** $column.columnComment */
+ private String 创建用户;
+
+ /** $column.columnComment */
+ private String 最近修改时间;
+
+ /** $column.columnComment */
+ private String 修改用户;
+
+ public void set选择供应商(String 选择供应商)
+ {
+ this.选择供应商 = 选择供应商;
+ }
+
+ public String get选择供应商()
+ {
+ return 选择供应商;
+ }
+ public void set订单签订日期(String 订单签订日期)
+ {
+ this.订单签订日期 = 订单签订日期;
+ }
+
+ public String get订单签订日期()
+ {
+ return 订单签订日期;
+ }
+ public void set采购订单名称(String 采购订单名称)
+ {
+ this.采购订单名称 = 采购订单名称;
+ }
+
+ public String get采购订单名称()
+ {
+ return 采购订单名称;
+ }
+ public void set订单交付日期(String 订单交付日期)
+ {
+ this.订单交付日期 = 订单交付日期;
+ }
+
+ public String get订单交付日期()
+ {
+ return 订单交付日期;
+ }
+ public void set采购负责人(String 采购负责人)
+ {
+ this.采购负责人 = 采购负责人;
+ }
+
+ public String get采购负责人()
+ {
+ return 采购负责人;
+ }
+ public void set入库仓库(String 入库仓库)
+ {
+ this.入库仓库 = 入库仓库;
+ }
+
+ public String get入库仓库()
+ {
+ return 入库仓库;
+ }
+ public void set采购原价总额含税(Long 采购原价总额含税)
+ {
+ this.采购原价总额含税 = 采购原价总额含税;
+ }
+
+ public Long get采购原价总额含税()
+ {
+ return 采购原价总额含税;
+ }
+ public void set优惠金额(Long 优惠金额)
+ {
+ this.优惠金额 = 优惠金额;
+ }
+
+ public Long get优惠金额()
+ {
+ return 优惠金额;
+ }
+ public void set整单折扣率(Long 整单折扣率)
+ {
+ this.整单折扣率 = 整单折扣率;
+ }
+
+ public Long get整单折扣率()
+ {
+ return 整单折扣率;
+ }
+ public void set采购订单金额含税(Long 采购订单金额含税)
+ {
+ this.采购订单金额含税 = 采购订单金额含税;
+ }
+
+ public Long get采购订单金额含税()
+ {
+ return 采购订单金额含税;
+ }
+ public void set采购金额合计不含税(Long 采购金额合计不含税)
+ {
+ this.采购金额合计不含税 = 采购金额合计不含税;
+ }
+
+ public Long get采购金额合计不含税()
+ {
+ return 采购金额合计不含税;
+ }
+ public void set合同附件上传(String 合同附件上传)
+ {
+ this.合同附件上传 = 合同附件上传;
+ }
+
+ public String get合同附件上传()
+ {
+ return 合同附件上传;
+ }
+ public void set到货地址(String 到货地址)
+ {
+ this.到货地址 = 到货地址;
+ }
+
+ public String get到货地址()
+ {
+ return 到货地址;
+ }
+ public void set具体地址(String 具体地址)
+ {
+ this.具体地址 = 具体地址;
+ }
+
+ public String get具体地址()
+ {
+ return 具体地址;
+ }
+ public void set结算期限(String 结算期限)
+ {
+ this.结算期限 = 结算期限;
+ }
+
+ public String get结算期限()
+ {
+ return 结算期限;
+ }
+ public void set创建时间(String 创建时间)
+ {
+ this.创建时间 = 创建时间;
+ }
+
+ public String get创建时间()
+ {
+ return 创建时间;
+ }
+ public void set创建用户(String 创建用户)
+ {
+ this.创建用户 = 创建用户;
+ }
+
+ public String get创建用户()
+ {
+ return 创建用户;
+ }
+ public void set最近修改时间(String 最近修改时间)
+ {
+ this.最近修改时间 = 最近修改时间;
+ }
+
+ public String get最近修改时间()
+ {
+ return 最近修改时间;
+ }
+ public void set修改用户(String 修改用户)
+ {
+ this.修改用户 = 修改用户;
+ }
+
+ public String get修改用户()
+ {
+ return 修改用户;
+ }
+
+ @Override
+ public String toString() {
+ return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+ .append("选择供应商", get选择供应商())
+ .append("订单签订日期", get订单签订日期())
+ .append("采购订单名称", get采购订单名称())
+ .append("订单交付日期", get订单交付日期())
+ .append("采购负责人", get采购负责人())
+ .append("入库仓库", get入库仓库())
+ .append("采购原价总额(含税)/元", get采购原价总额含税())
+ .append("优惠金额", get优惠金额())
+ .append("整单折扣率", get整单折扣率())
+ .append("采购订单金额(含税)/元", get采购订单金额含税())
+ .append("采购金额合计(不含税)/元", get采购金额合计不含税())
+ .append("合同附件上传", get合同附件上传())
+ .append("到货地址", get到货地址())
+ .append("具体地址", get具体地址())
+ .append("结算期限", get结算期限())
+ .append("创建时间", get创建时间())
+ .append("创建用户", get创建用户())
+ .append("最近修改时间", get最近修改时间())
+ .append("修改用户", get修改用户())
+ .toString();
+ }
+}
diff --git a/src/main/java/com/dsic/gj_erp/bean/kc/ImCkwpkwp.java b/src/main/java/com/dsic/gj_erp/bean/kc/ImCkwpkwp.java
index 5afbd51..2fd0718 100644
--- a/src/main/java/com/dsic/gj_erp/bean/kc/ImCkwpkwp.java
+++ b/src/main/java/com/dsic/gj_erp/bean/kc/ImCkwpkwp.java
@@ -1,10 +1,14 @@
package com.dsic.gj_erp.bean.kc;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.github.jeffreyning.mybatisplus.anno.MppMultiId;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.Setter;
+import java.math.BigDecimal;
+
/**
* 库存信息
*/
@@ -20,15 +24,446 @@ public class ImCkwpkwp {
private String kwh;//垛位
@MppMultiId
private String nbsbm;
+ private String pwbz;
+// private String ydid;
+//
+// private String cfcs1;//层数
+//
+// private String dcCh;
+// private String dcPl;
+// private String dcFd;
+// private String dcTh;
+//
+// private String qxkcl;//物品数量
+// private String wpzt;//ky:可用;dy:代用
+//
+//
+// private BigDecimal jjkcl;
+// private BigDecimal mfkcl;
+// private BigDecimal kcje;
+// private String khth;
+// private String dhh;
+// private String bsbs;
+// private String bssch;
+// private String ylrkbs;
+// private String jgflm;
+// private String ddh;
+//// private String ckh;
+//// private String wph;
+//// private String kwh;
+//// private String nbsbm;
+//// private String wpzt;
+//// private BigDecimal qxkcl;
+// private String rkrq;
+// private BigDecimal rkdj;
+// private String kslx;
+// private String ksbm;
+// private String dqbm;
+// private String kssx;
+// private String ddtz;
+// private String cph;
+// private BigDecimal ddxh;
+// private String bz;
+// private String sxrq;
+// private String wpph;
+// private BigDecimal djzl;
+// private BigDecimal zzl;
+// private String xgrq;
+// private String xgr;
+// private String cpbs;
+// private String hdlx;
+// private String lph;
+// private BigDecimal cfcs;
+// private BigDecimal qxkcl1;
+//// private String cfcs1;
+// private String ylzd1;
+// private String ylzd2;
+// private String ylzd3;
+// private String ylzd4;
+// private String ylzd5;
+// private String ylzd6;
+// private BigDecimal ylzd7;
+// private BigDecimal ylzd8;
+// private BigDecimal ylzd9;
+// private BigDecimal ylzd10;
+// private BigDecimal ylzd11;
+// private BigDecimal ylzd12;
+// private BigDecimal ylzd13;
+// private BigDecimal ylzd14;
+// private BigDecimal ylzd15;
+//// private String dcCh;
+//// private String dcCm;
+//// private String dcPl;
+//// private String dcFd;
+//// private String dcTh;
+// private String dcZl;
+// private String dcTz;
+// private String dcYj;
+// private String dcYs;
+// private String dcPb;
+// private String dcLph;
+// private String dcTpbh;
+// private String dcTpmc;
+// private String dcCh1;
+// private String dcCm1;
+// private String dcPl1;
+// private String flch;
+// private String flpl;
+// private String xz;
+// private String llr;
+// private String llrq;
+// private String zych;
+// private String zypl;
+// private String zylx;
+// private String rklx;
+// private String bgr;
+// private String bgrq;
+// private String yxz;
+// private String ybgr;
+// private String ybgrq;
+// private String ykwh;
+// private BigDecimal dbsl;
+// private String pwwz;
+// private String sldw;
+// private String gcddh;
+// private String jsczrq;
+// private String jsczry;
+// private String fph;
+// private BigDecimal dddj;
+// private BigDecimal hsdj;
+// private BigDecimal jse;
+// private BigDecimal fks1;
+// private BigDecimal hkje;
+// private BigDecimal ftyfje;
+// private BigDecimal ftyfse;
+// private String bzr;
+// private String bzrq;
+// private String sllsh;
+// private String dyry;
+// private String dyrq;
+// private String yprq;
+// private String ypsm;
+
+ @ApiModelProperty(value = "炉批号")
+ @TableField("LPH")
+ private String lph;
- private String cfcs1;//层数
+ @ApiModelProperty(value = "存放层数")
+ @TableField("CFCS")
+ private BigDecimal cfcs;
+ @ApiModelProperty(value = "船号")
+ @TableField("DC_CH")
private String dcCh;
+
+ @ApiModelProperty(value = "船名")
+ @TableField("DC_CM")
+ private String dcCm;
+
+ @ApiModelProperty(value = "批量")
+ @TableField("DC_PL")
private String dcPl;
+
+ @ApiModelProperty(value = "分段")
+ @TableField("DC_FD")
private String dcFd;
+
+ @ApiModelProperty(value = "图号")
+ @TableField("DC_TH")
private String dcTh;
- private String qxkcl;//物品数量
- private String wpzt;//ky:可用;dy:代用
+ @ApiModelProperty(value = "组立")
+ @TableField("DC_ZL")
+ private String dcZl;
+
+ @ApiModelProperty(value = "特征")
+ @TableField("DC_TZ")
+ private String dcTz;
+
+ @ApiModelProperty(value = "依据")
+ @TableField("DC_YJ")
+ private String dcYj;
+
+ @ApiModelProperty(value = "页数")
+ @TableField("DC_YS")
+ private String dcYs;
+
+ @ApiModelProperty(value = "拼板")
+ @TableField("DC_PB")
+ private String dcPb;
+
+ @ApiModelProperty(value = "炉批号")
+ @TableField("DC_LPH")
+ private String dcLph;
+
+ @ApiModelProperty(value = "托盘编号")
+ @TableField("DC_TPBH")
+ private String dcTpbh;
+
+ @ApiModelProperty(value = "托盘名称")
+ @TableField("DC_TPMC")
+ private String dcTpmc;
+
+ @ApiModelProperty(value = "船号")
+ @TableField("DC_CH1")
+ private String dcCh1;
+
+ @ApiModelProperty(value = "船名")
+ @TableField("DC_CM1")
+ private String dcCm1;
+
+ @ApiModelProperty(value = "批量")
+ @TableField("DC_PL1")
+ private String dcPl1;
+
+ @ApiModelProperty(value = "抛丸位置")
+ @TableField("PWWZ")
+ private String pwwz;
+
+ @ApiModelProperty(value = "抛丸位置")
+ @TableField("SLDW")
+ private String sldw;
+
+ @ApiModelProperty(value = "船级社")
+ @TableField("CJS")
+ private String cjs;
+
+ @TableField("YLZD5")
+ private String ylzd5;
+
+ @TableField("KSBM")
+ private String ksbm;
+
+ @TableField("LLRQ")
+ private String llrq;
+
+ @TableField("QXKCL1")
+ private BigDecimal qxkcl1;
+
+ @TableField("YBGRQ")
+ private String ybgrq;
+
+
+
+ @TableField("YLZD13")
+ private BigDecimal ylzd13;
+
+ private String bzrq;
+
+ @TableField("RKRQ")
+ private String rkrq;
+
+ @TableField("DDTZ")
+ private String ddtz;
+
+ private BigDecimal jse;
+
+ @TableField("YLZD2")
+ private String ylzd2;
+
+ @TableField("ZYLX")
+ private String zylx;
+
+ @TableField("XGRQ")
+ private String xgrq;
+
+ @TableField("HDLX")
+ private String hdlx;
+
+ @TableField("BGRQ")
+ private String bgrq;
+
+ private String dyrq;
+
+ @TableField("KCJE")
+ private BigDecimal kcje;
+
+ private BigDecimal ftyfje;
+
+
+
+ @TableField("RKDJ")
+ private BigDecimal rkdj;
+
+ private String jsczrq;
+
+ private BigDecimal fks1;
+
+ @TableField("XZ")
+ private String xz;
+
+ @TableField("BZ")
+ private String bz;
+
+ @TableField("RKLX")
+ private String rklx;
+
+ @TableField("XGR")
+ private String xgr;
+
+ @TableField("YXZ")
+ private String yxz;
+
+ private BigDecimal ftyfse;
+
+ @TableField("YLZD11")
+ private BigDecimal ylzd11;
+
+ @TableField("BSBS")
+ private String bsbs;
+
+
+ @TableField("DDDJ")
+ private BigDecimal dddj;
+
+ @TableField("YLZD8")
+ private BigDecimal ylzd8;
+
+ @TableField("CFCS1")
+ private String cfcs1;
+
+ @TableField("ZYCH")
+ private String zych;
+
+ @TableField("DJZL")
+ private BigDecimal djzl;
+
+ @TableField("JGFLM")
+ private String jgflm;
+
+ @TableField("WPZT")
+ private String wpzt;
+
+ @TableField("YLZD14")
+ private BigDecimal ylzd14;
+
+ private String sllsh;
+
+ @TableField("CPH")
+ private String cph;
+
+ @TableField("YLZD3")
+ private String ylzd3;
+
+ @TableField("YLZD9")
+ private BigDecimal ylzd9;
+
+ @TableField("FLCH")
+ private String flch;
+
+ private BigDecimal hsdj;
+
+ @TableField("ZYPL")
+ private String zypl;
+
+ @TableField("ZZL")
+ private BigDecimal zzl;
+
+ @TableField("CPBS")
+ private String cpbs;
+
+ private String yprq;
+
+ @TableField("DDH")
+ private String ddh;
+
+ @TableField("KHTH")
+ private String khth;
+
+ @TableField("YLZD15")
+ private BigDecimal ylzd15;
+
+ @TableField("DQBM")
+ private String dqbm;
+
+ private String jsczry;
+
+ @TableField("HKJE")
+ private BigDecimal hkje;
+
+ @TableField("YLZD6")
+ private String ylzd6;
+
+ @TableField("SXRQ")
+ private String sxrq;
+
+ @TableField("LLR")
+ private String llr;
+
+ @TableField("YKWH")
+ private String ykwh;
+
+ @TableField("JJKCL")
+ private BigDecimal jjkcl;
+
+
+
+ @TableField("YLZD12")
+ private BigDecimal ylzd12;
+
+ private String ydid;
+
+ @TableField("BSSCH")
+ private String bssch;
+
+ @TableField("YLZD7")
+ private BigDecimal ylzd7;
+
+ @TableField("KSSX")
+ private String kssx;
+
+ private String fph;
+
+ @TableField("YLZD1")
+ private String ylzd1;
+
+ @TableField("WPPH")
+ private String wpph;
+
+ @TableField("DBSL")
+ private BigDecimal dbsl;
+
+ @TableField("QXKCL")
+ private BigDecimal qxkcl;
+
+ @TableField("MFKCL")
+ private BigDecimal mfkcl;
+
+ private String dyry;
+
+ @TableField("YLRKBS")
+ private String ylrkbs;
+
+ @TableField("YLZD4")
+ private String ylzd4;
+
+ @TableField("YLZD10")
+ private BigDecimal ylzd10;
+
+ @TableField("FLPL")
+ private String flpl;
+
+ @TableField("KSLX")
+ private String kslx;
+
+ @TableField("GCDDH")
+ private String gcddh;
+
+ @TableField("DDXH")
+ private BigDecimal ddxh;
+
+ @TableField("BGR")
+ private String bgr;
+
+ @TableField("YBGR")
+ private String ybgr;
+
+ private String bzr;
+
+ @TableField("DHH")
+ private String dhh;
+
+ private String ypsm;
+
}
diff --git a/src/main/java/com/dsic/gj_erp/bean/kc/SlKc.java b/src/main/java/com/dsic/gj_erp/bean/kc/SlKc.java
new file mode 100644
index 0000000..81996fe
--- /dev/null
+++ b/src/main/java/com/dsic/gj_erp/bean/kc/SlKc.java
@@ -0,0 +1,72 @@
+package com.dsic.gj_erp.bean.kc;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * SlKc:
+ * 上料库存
+ * @author xhj
+ * @date 2024/09/07
+ */
+@Data
+public class SlKc {
+ private String KWH;
+ private String SXRQ;
+ private String dzwz;
+ private String NBSBM;
+ private String BSBS;
+ private String BSSCH;
+ private String DQBM;
+ private String RKRQ;
+ private String KSBM;
+ private String KSSX;
+ private String KSLX;
+ private String CGFLM;
+ private String GCDDH;
+ private String WPPH;
+ private Double QXKCL;
+ private Double RKDJ;
+ private String KCJE;
+ private String DHH;
+ private String KHTH;
+ private String CPH;
+ private String DDTZ;
+ private String DDH;
+ private String BZ;
+ private String cpbs;
+ private String DDXH;
+ private String CFCS;
+ private String LPH;
+ private String CFCS1;
+ private String QXKCL1;
+ private String DCCH;
+ private String DCCM;
+ private String dcPl;
+ private String dcFd;
+ private String DCTH;
+ private String xz;
+ private String CKH;
+ private String WPH;
+ private String WPMC;
+ private String WPGG;
+ private String WPXH;
+ private String WPFLM;
+ private String dcTpbh;
+ private String ZYCH;
+ private String ZYPL;
+ private String ZYLX;
+ private String pwwz;
+ private String SLDW;
+ private String WPZT;
+ private String sllsh;
+ private String dyry;
+ private String dyrq;
+ private String ydid;
+ private Integer xh;
+ private String cz;
+ private String pwbz;
+
+ private List list;
+}
diff --git a/src/main/java/com/dsic/gj_erp/bean/pbsc/MpYlxxp.java b/src/main/java/com/dsic/gj_erp/bean/pbsc/MpYlxxp.java
new file mode 100644
index 0000000..18c9240
--- /dev/null
+++ b/src/main/java/com/dsic/gj_erp/bean/pbsc/MpYlxxp.java
@@ -0,0 +1,144 @@
+package com.dsic.gj_erp.bean.pbsc;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ *
+ *
+ *
+ *
+ * @author xhj
+ * @since 2024-09-08
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="MpYlxxp对象", description="")
+public class MpYlxxp implements Serializable {
+
+ private static final long serialVersionUID=1L;
+
+ @ApiModelProperty(value = "余料生成日期")
+ @TableField("SCRQ")
+ private String scrq;
+
+ @ApiModelProperty(value = "余料使用日期")
+ @TableField("SYRQ")
+ private String syrq;
+
+ @ApiModelProperty(value = "炉批号")
+ @TableField("DC_LPH")
+ private String dcLph;
+
+ @ApiModelProperty(value = "工作中心")
+ @TableField("GZZX")
+ private String gzzx;
+
+ @ApiModelProperty(value = "剩余材料存放_跨")
+ @TableField("YLCJBM")
+ private String ylcjbm;
+
+ @ApiModelProperty(value = "剩余材料存放_垛位号")
+ @TableField("YLKWH")
+ private String ylkwh;
+
+ @ApiModelProperty(value = "船号")
+ @TableField("DC_CH")
+ private String dcCh;
+
+ @ApiModelProperty(value = "批量")
+ @TableField("DC_PL")
+ private String dcPl;
+
+ @ApiModelProperty(value = "组立")
+ @TableField("DC_ZL")
+ private String dcZl;
+
+ @ApiModelProperty(value = "余料计量单位")
+ @TableField("JLDW")
+ private String jldw;
+
+ @ApiModelProperty(value = "余料生成日期")
+ @TableField("XGR")
+ private String xgr;
+
+ @ApiModelProperty(value = "余料生成日期")
+ @TableField("XGRQ")
+ private String xgrq;
+
+ @TableId(value = "ylsxh", type = IdType.ASSIGN_UUID)
+ private String ylsxh;
+
+ private String tzbh1;
+
+ private String ysrq;
+
+ private String zt;
+
+ private String hxbh;
+
+ private BigDecimal ylzl;
+
+ private String dcZl2;
+
+ private Double ylzd4;
+
+ private String wpxh;
+
+ private String dcPl2;
+
+ private BigDecimal t1;
+
+ private String ylbh;
+
+ private String ylzd1;
+
+ private String dcCs;
+
+ private BigDecimal sl;
+
+ private String bzrq;
+
+ private Double ylzd6;
+
+ private String hxfl;
+
+ private String bz;
+
+ private BigDecimal l;
+
+ private String dcTzbh2;
+
+ private String ylzd3;
+
+ @TableField("SYBS")
+ private String sybs;
+
+ private String dcHx;
+
+ private Double xh;
+
+ private String ylzd2;
+
+ private String bzry;
+
+ private String tzbh;
+
+ private Double ylzd5;
+
+ private String wpgg;
+
+ private BigDecimal b1;
+
+ private String dcCh2;
+
+
+}
diff --git a/src/main/java/com/dsic/gj_erp/bean/pgd/DmPpxxb.java b/src/main/java/com/dsic/gj_erp/bean/pgd/DmPpxxb.java
index 5f55447..ec49116 100644
--- a/src/main/java/com/dsic/gj_erp/bean/pgd/DmPpxxb.java
+++ b/src/main/java/com/dsic/gj_erp/bean/pgd/DmPpxxb.java
@@ -1,17 +1,15 @@
package com.dsic.gj_erp.bean.pgd;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableField;
-import java.io.Serializable;
-
+import com.baomidou.mybatisplus.annotation.TableName;
import com.github.jeffreyning.mybatisplus.anno.MppMultiId;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
+import java.io.Serializable;
+
/**
*
*
diff --git a/src/main/java/com/dsic/gj_erp/bean/pgd/PgdDh.java b/src/main/java/com/dsic/gj_erp/bean/pgd/PgdDh.java
index 68b3327..c9c2fa0 100644
--- a/src/main/java/com/dsic/gj_erp/bean/pgd/PgdDh.java
+++ b/src/main/java/com/dsic/gj_erp/bean/pgd/PgdDh.java
@@ -2,12 +2,13 @@ package com.dsic.gj_erp.bean.pgd;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
-import java.io.Serializable;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
+import java.io.Serializable;
+
/**
*
*
diff --git a/src/main/java/com/dsic/gj_erp/bean/pgd/PgdDmjh.java b/src/main/java/com/dsic/gj_erp/bean/pgd/PgdDmjh.java
index 3282c6a..636baa5 100644
--- a/src/main/java/com/dsic/gj_erp/bean/pgd/PgdDmjh.java
+++ b/src/main/java/com/dsic/gj_erp/bean/pgd/PgdDmjh.java
@@ -2,12 +2,13 @@ package com.dsic.gj_erp.bean.pgd;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
-import java.io.Serializable;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
+import java.io.Serializable;
+
/**
*
*
@@ -122,5 +123,8 @@ public class PgdDmjh implements Serializable {
@TableId(value = "id", type = IdType.ASSIGN_UUID)
private String id;
-
+ private String scdw;
+ private String scry;
+ private String jsry;
+ private String jsrq;
}
diff --git a/src/main/java/com/dsic/gj_erp/bean/pgd/PgdPkjh.java b/src/main/java/com/dsic/gj_erp/bean/pgd/PgdPkjh.java
index 8ef7c6f..5eece15 100644
--- a/src/main/java/com/dsic/gj_erp/bean/pgd/PgdPkjh.java
+++ b/src/main/java/com/dsic/gj_erp/bean/pgd/PgdPkjh.java
@@ -2,12 +2,13 @@ package com.dsic.gj_erp.bean.pgd;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
-import java.io.Serializable;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
+import java.io.Serializable;
+
/**
*
*
@@ -126,4 +127,9 @@ public class PgdPkjh implements Serializable {
private String id;
+ private String scdw;
+ private String scry;
+ private String jsry;
+ private String jsrq;
+
}
diff --git a/src/main/java/com/dsic/gj_erp/bean/pgd/PgdPwjh.java b/src/main/java/com/dsic/gj_erp/bean/pgd/PgdPwjh.java
index e6c01ba..99f2230 100644
--- a/src/main/java/com/dsic/gj_erp/bean/pgd/PgdPwjh.java
+++ b/src/main/java/com/dsic/gj_erp/bean/pgd/PgdPwjh.java
@@ -2,12 +2,13 @@ package com.dsic.gj_erp.bean.pgd;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
-import java.io.Serializable;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
+import java.io.Serializable;
+
/**
*
*
@@ -110,5 +111,10 @@ public class PgdPwjh implements Serializable {
@TableId(value = "id", type = IdType.ASSIGN_UUID)
private String id;
+ private String scdw;
+ private String scry;
+ private String jsry;
+ private String jsrq;
+ private String pwlsh;
}
diff --git a/src/main/java/com/dsic/gj_erp/bean/pgd/PgdQgjh.java b/src/main/java/com/dsic/gj_erp/bean/pgd/PgdQgjh.java
index a7403a0..0625d95 100644
--- a/src/main/java/com/dsic/gj_erp/bean/pgd/PgdQgjh.java
+++ b/src/main/java/com/dsic/gj_erp/bean/pgd/PgdQgjh.java
@@ -2,12 +2,13 @@ package com.dsic.gj_erp.bean.pgd;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
-import java.io.Serializable;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
+import java.io.Serializable;
+
/**
*
*
@@ -135,5 +136,9 @@ public class PgdQgjh implements Serializable {
@TableId(value = "id", type = IdType.ASSIGN_UUID)
private String id;
-
+ private String scdw;
+ private String scry;
+ private String jsry;
+ private String jsrq;
+ private String qglsh;
}
diff --git a/src/main/java/com/dsic/gj_erp/bean/pgd/PgdQmjh.java b/src/main/java/com/dsic/gj_erp/bean/pgd/PgdQmjh.java
index 02680d9..e989dab 100644
--- a/src/main/java/com/dsic/gj_erp/bean/pgd/PgdQmjh.java
+++ b/src/main/java/com/dsic/gj_erp/bean/pgd/PgdQmjh.java
@@ -2,12 +2,13 @@ package com.dsic.gj_erp.bean.pgd;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
-import java.io.Serializable;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
+import java.io.Serializable;
+
/**
*
*
@@ -118,6 +119,9 @@ public class PgdQmjh implements Serializable {
@TableId(value = "id", type = IdType.ASSIGN_UUID)
private String id;
-
+ private String scdw;
+ private String scry;
+ private String jsry;
+ private String jsrq;
}
diff --git a/src/main/java/com/dsic/gj_erp/bean/pgd/PgdSljh.java b/src/main/java/com/dsic/gj_erp/bean/pgd/PgdSljh.java
index 7ab571e..d9af066 100644
--- a/src/main/java/com/dsic/gj_erp/bean/pgd/PgdSljh.java
+++ b/src/main/java/com/dsic/gj_erp/bean/pgd/PgdSljh.java
@@ -2,12 +2,13 @@ package com.dsic.gj_erp.bean.pgd;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
-import java.io.Serializable;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
+import java.io.Serializable;
+
/**
*
*
@@ -123,4 +124,11 @@ public class PgdSljh implements Serializable {
private String id;
+ private String dw;
+ private String scdw;
+ private String scry;
+ private String jsry;
+ private String jsrq;
+
+ private String sllsh;
}
diff --git a/src/main/java/com/dsic/gj_erp/bean/pgd/PgdTzjh.java b/src/main/java/com/dsic/gj_erp/bean/pgd/PgdTzjh.java
index 90d0b67..89e9f33 100644
--- a/src/main/java/com/dsic/gj_erp/bean/pgd/PgdTzjh.java
+++ b/src/main/java/com/dsic/gj_erp/bean/pgd/PgdTzjh.java
@@ -2,15 +2,18 @@ package com.dsic.gj_erp.bean.pgd;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
-import java.io.Serializable;
+import com.dsic.gj_erp.bean.jhgk.YdjhImport;
+import com.dsic.gj_erp.bean.jhgk.YdjhImportNew;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
+import java.io.Serializable;
+
/**
*
- *
+ *
*
*
* @author xn
@@ -78,4 +81,23 @@ public class PgdTzjh implements Serializable {
private String fkry;
+ public static PgdTzjh of(YdjhImport jh, String pl){
+ PgdTzjh tzjh = new PgdTzjh();
+ tzjh.setCzbh(jh.getDcCh());
+ tzjh.setPl(pl);
+ tzjh.setQfxqrqxz(jh.getQfxqrqxz());
+ tzjh.setQfxqrqdz(jh.getQfxqrqdz());
+ tzjh.setZt("01");
+ return tzjh;
+ }
+
+ public static PgdTzjh of(YdjhImportNew jh, String pl){
+ PgdTzjh tzjh = new PgdTzjh();
+ tzjh.setCzbh(jh.getDcCh());
+ tzjh.setPl(pl);
+ tzjh.setQfxqrqxz(jh.getQfxqrqxz());
+ tzjh.setQfxqrqdz(jh.getQfxqrqdz());
+ tzjh.setZt("01");
+ return tzjh;
+ }
}
diff --git a/src/main/java/com/dsic/gj_erp/bean/pgd/Qmqz.java b/src/main/java/com/dsic/gj_erp/bean/pgd/Qmqz.java
index 78a2951..6bba1f9 100644
--- a/src/main/java/com/dsic/gj_erp/bean/pgd/Qmqz.java
+++ b/src/main/java/com/dsic/gj_erp/bean/pgd/Qmqz.java
@@ -1,12 +1,12 @@
package com.dsic.gj_erp.bean.pgd;
import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.TableField;
-import java.io.Serializable;
import io.swagger.annotations.ApiModel;
import lombok.Data;
import lombok.EqualsAndHashCode;
+import java.io.Serializable;
+
/**
*
*
diff --git a/src/main/java/com/dsic/gj_erp/bean/request/CopyRequest.java b/src/main/java/com/dsic/gj_erp/bean/request/CopyRequest.java
new file mode 100644
index 0000000..fe9c8bd
--- /dev/null
+++ b/src/main/java/com/dsic/gj_erp/bean/request/CopyRequest.java
@@ -0,0 +1,13 @@
+package com.dsic.gj_erp.bean.request;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class CopyRequest {
+ private String project;//工程号
+ private String dwgNo;//图号
+ private Integer amount=1;//数量
+ private T bean;
+}
diff --git a/src/main/java/com/dsic/gj_erp/bean/scjh/GzscjhzxckVo.java b/src/main/java/com/dsic/gj_erp/bean/scjh/GzscjhzxckVo.java
new file mode 100644
index 0000000..1cfeea0
--- /dev/null
+++ b/src/main/java/com/dsic/gj_erp/bean/scjh/GzscjhzxckVo.java
@@ -0,0 +1,367 @@
+package com.dsic.gj_erp.bean.scjh;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.math.BigDecimal;
+
+/**
+ *
+ * 管子生产计划执行查询情况返回Vo 愮有 制作完工时间得根数 处理完工时间得根数 配送出库完成得时间
+ *
+ *
+ * @author xhj
+ * @since 2021-10-29
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class GzscjhzxckVo {
+
+ private static final long serialVersionUID=1L;
+
+ // >=06
+ private Long zzwgQty;
+ //>=07
+ private Long clwgQty;
+ //>=10
+ private Long psckQty;
+
+
+
+ private String id;
+
+ @ApiModelProperty(value = "工程编号 Q11")
+ private String project;
+
+ @ApiModelProperty(value = "区域 Q12")
+ private String zone;
+
+ @ApiModelProperty(value = "分段号 Q13")
+ private String blockNo;
+
+ @ApiModelProperty(value = "批号 Q21")
+ private String ph;
+
+ @ApiModelProperty(value = "卡号 Q22")
+ private String kh;
+
+ @ApiModelProperty(value = "暂不使用 不显示")
+ private String pmlNo;
+
+ @ApiModelProperty(value = "制作图号 Q23")
+ private String dwgNo;
+
+ @ApiModelProperty(value = "图纸名称 Q24")
+ private String dwgName;
+
+ @ApiModelProperty(value = "计划分类 dict=‘jhlx’ (1001-管支架 0201-管子制作)")
+ private String planType;
+
+ @ApiModelProperty(value = "图纸类型 Q25 dict='TZLX' (01-制作图 02-通知单 99-其他) 默认01")
+ private String dwgType;
+
+ @ApiModelProperty(value = "数量")
+ private BigDecimal qty;
+
+ @ApiModelProperty(value = "工时")
+ private BigDecimal wkh;
+
+ @ApiModelProperty(value = "管材重量(吨)")
+ private BigDecimal wgt;
+
+ @ApiModelProperty(value = "计划状态 Q15 dict=‘SCJHZT’ (01-编制 02-提交 03-审核 04-预留 05-平衡) 默认01")
+ private String status;
+
+ @ApiModelProperty(value = "责任单位 (默认 02-管系制造部)")
+ private String departCode;
+
+ @ApiModelProperty(value = "所属车间 不用显示关联制作图数据使用 默认赋值(02-管子 021-管支架)")
+ private String sscj;
+
+ @ApiModelProperty(value = "需求单位 Q31 (dm_demand_depart需求单位表)")
+ private String xqdw;
+
+ @ApiModelProperty(value = "需求时间 Q32 (1时间类型:需求时间|制作完工计划时间|集配入库计划完成时间 2开始 3结束)")
+ private String xqsj;
+
+ @ApiModelProperty(value = "配送地点 暂不使用")
+ private String xqdd;
+
+ @ApiModelProperty(value = "前方实际需求日期")
+ private String sjxqsj;
+
+ @ApiModelProperty(value = "前方实际需求周次")
+ private String sjxqzc;
+
+ @ApiModelProperty(value = "计划提前期方案")
+ private String leadtimeName;
+
+ @ApiModelProperty(value = "图纸证件需求时间")
+ private String tzzjJhsj;
+
+ @ApiModelProperty(value = "技术处理下图计划时间")
+ private String jsclJhsj;
+
+ @ApiModelProperty(value = "物资准备完成计划时间")
+ private String wzzbJhsj;
+
+ @ApiModelProperty(value = "备料完成计划时间 暂不使用")
+ private String blwgJhsj;
+
+ @ApiModelProperty(value = "机加工完工计划时间 暂不使用")
+ private String jjwgJhsj;
+
+ @ApiModelProperty(value = "制作完工计划时间")
+ private String zzwgJhsj;
+
+ @ApiModelProperty(value = "涂塑处理完工计划时间")
+ private String tswgJhsj;
+
+ @ApiModelProperty(value = "表面处理完工计划时间")
+ private String clwgJhsj;
+
+ @ApiModelProperty(value = "涂装完工计划时间 暂不使用")
+ private String tzwgJhsj;
+
+ @ApiModelProperty(value = "集配入库计划时间")
+ private String jprkJhsj;
+
+ @ApiModelProperty(value = "计划性质 (计划平衡时输入)")
+ private String jhxz;
+
+ @ApiModelProperty(value = "集配入库平衡计划时间 (计划平衡时输入)")
+ private String jprkPhsj;
+
+ @ApiModelProperty(value = "图纸证件来图时间")
+ private String tzzjSjsj;
+
+ @ApiModelProperty(value = "图纸份数")
+ private Integer tzzjFs;
+
+ @ApiModelProperty(value = "图纸登记人员")
+ private String tzzjDjry;
+
+ @ApiModelProperty(value = "技术处理完成时间")
+ private String jsclSjsj;
+
+ @ApiModelProperty(value = "主管工艺员")
+ private String gyry;
+
+ @ApiModelProperty(value = "物资准备完成时间 (开始-结束)")
+ private String wzzbSjsj;
+
+ @ApiModelProperty(value = "作业计划下达时间 (开始-结束)")
+ private String zyjhSjsj;
+
+ @ApiModelProperty(value = "备料完成时间 (开始-结束) 暂不使用")
+ private String blwgSjsj;
+
+ @ApiModelProperty(value = "机加工完工时间 (开始-结束) 暂不使用")
+ private String jjwgSjsj;
+
+ //制作完工转运回报
+ @ApiModelProperty(value = "制作完工时间 (开始-结束)")
+ private String zzwgSjsj;
+
+ @ApiModelProperty(value = "涂塑完工时间 (开始-结束)")
+ private String tswgSjsj;
+
+ //表面处理完工回报反写
+ @ApiModelProperty(value = "表面处理完工时间 (开始-结束)")
+ private String vlwgSjsj;
+
+
+ @ApiModelProperty(value = "涂装完工时间 (开始-结束) 暂不使用")
+ private String tzwgSjsj;
+
+ @ApiModelProperty(value = "集配入库时间 (开始-结束)")
+ private String jprkSjsj;
+
+ //管子前方配送维护时反写
+ @ApiModelProperty(value = "配送出库时间 (开始-结束)")
+ private String psckSjsj;
+
+ @ApiModelProperty(value = "生产状态 预留")
+ private String status1;
+
+ @ApiModelProperty(value = "拖期说明")
+ private String delayRemark;
+
+ @ApiModelProperty(value = "编制人员 Q14")
+ private String bzry;
+
+ @ApiModelProperty(value = "编制日期")
+ private String bzrq;
+
+ @ApiModelProperty(value = "提交人员")
+ private String tjry;
+
+ @ApiModelProperty(value = "提交日期")
+ private String tjrq;
+
+ @ApiModelProperty(value = "审核人员")
+ private String shry;
+
+ @ApiModelProperty(value = "审核日期")
+ private String shrq;
+
+ @ApiModelProperty(value = "平衡人员")
+ private String phry;
+
+ @ApiModelProperty(value = "平衡日期")
+ private String phrq;
+
+ @ApiModelProperty(value = "备注")
+ private String remark;
+
+ @ApiModelProperty(value = "舾装需求计划日期")
+ private String xzxqJhrq;
+
+ @ApiModelProperty(value = "舾装需求编制人员")
+ private String xzxqBzry;
+
+ @ApiModelProperty(value = "舾装需求编制日期")
+ private String xzxqBzrq;
+
+ @ApiModelProperty(value = "舾装需求备注")
+ private String xzxqRemark;
+
+ @ApiModelProperty(value = "计划修正次数")
+ private Integer modifyTimes;
+
+ @ApiModelProperty(value = "计划修正人员")
+ private String modifyRy;
+
+ @ApiModelProperty(value = "计划修正日期")
+ private String modifyRq;
+
+ @ApiModelProperty(value = "原需求日期")
+ private String lastXqsj;
+
+ @ApiModelProperty(value = "原制作完工计划时间")
+ private String lastZzwgJhsj;
+
+ @ApiModelProperty(value = "原集配入库计划时间")
+ private String lastJprkJhsj;
+
+ @ApiModelProperty(value = "材料托盘表")
+ private String pmlCl;
+
+ @ApiModelProperty(value = "材料托盘表-来图时间")
+ private String pmlClLtsj;
+
+ @ApiModelProperty(value = "制作件托盘表")
+ private String pmlZz;
+
+ @ApiModelProperty(value = "制作件托盘表-来图时间")
+ private String pmlZzLtsj;
+
+ @ApiModelProperty(value = "安装托盘表")
+ private String pmlAz;
+
+ @ApiModelProperty(value = "安装托盘表-来图时间")
+ private String pmlAzLtsj;
+
+ @ApiModelProperty(value = "安装附件托盘表")
+ private String pmlAzfj;
+
+ @ApiModelProperty(value = "安装附件托盘表-来图时间")
+ private String pmlAzfjLtsj;
+
+ @ApiModelProperty(value = "管支架制作图")
+ private String dwgGzj;
+
+ @ApiModelProperty(value = "管支架制作图-来图时间")
+ private String dwgGzjLtsj;
+
+ @ApiModelProperty(value = "安装图号")
+ private String dwgAz;
+
+ @ApiModelProperty(value = "安装图-来图时间")
+ private String dwgAzLtsj;
+
+ @ApiModelProperty(value = "订货清单_管材")
+ private String dhqdGc;
+
+ @ApiModelProperty(value = "订货清单_附件")
+ private String dhqdFj;
+
+ @ApiModelProperty(value = "订货清单_焊材")
+ private String dhqdHc;
+
+ @ApiModelProperty(value = "采购批号_管材")
+ private String cgphGc;
+
+ @ApiModelProperty(value = "采购批号_附件")
+ private String cgphFj;
+
+ @ApiModelProperty(value = "取消标识 Y/N 默认N")
+ private String cancelMark;
+
+ @ApiModelProperty(value = "取消日期")
+ private String cancelDate;
+
+ @ApiModelProperty(value = "取消人员")
+ private String cancelUser;
+
+ @ApiModelProperty(value = "取消说明")
+ private String cancelRemark;
+
+ @ApiModelProperty(value = "WP_NO 暂不使用CIMS预留")
+ @TableField("WP_NO")
+ private String wpNo;
+
+ @ApiModelProperty(value = "WO_NO 暂不使用CIMS预留")
+ @TableField("WO_NO")
+ private String woNo;
+
+ @ApiModelProperty(value = "WRK_ORGN 暂不使用CIMS预留")
+ @TableField("WRK_ORGN")
+ private String wrkOrgn;
+
+ @ApiModelProperty(value = "DEPT_STPLDT 暂不使用CIMS预留")
+ @TableField("DEPT_STPLDT")
+ private String deptStpldt;
+
+ @ApiModelProperty(value = "DEPT_FIPLDT 暂不使用CIMS预留")
+ @TableField("DEPT_FIPLDT")
+ private String deptFipldt;
+
+ @ApiModelProperty(value = "WK_STDT 暂不使用CIMS预留")
+ @TableField("WK_STDT")
+ private String wkStdt;
+
+ @ApiModelProperty(value = "WK_FIDT 暂不使用CIMS预留")
+ @TableField("WK_FIDT")
+ private String wkFidt;
+
+ @ApiModelProperty(value = "RGST_USER_ID 暂不使用CIMS预留")
+ @TableField("RGST_USER_ID")
+ private String rgstUserId;
+
+ @ApiModelProperty(value = "CIMS_ST_SN 暂不使用CIMS预留")
+ @TableField("CIMS_ST_SN")
+ private String cimsStSn;
+
+ @ApiModelProperty(value = "CIMS_FI_SN 暂不使用CIMS预留")
+ @TableField("CIMS_FI_SN")
+ private String cimsFiSn;
+
+ private String ylzd1;
+
+ private String ylzd2;
+
+ private String ylzd3;
+
+ private BigDecimal ylzd4;
+
+ private BigDecimal ylzd5;
+
+ private BigDecimal ylzd6;
+
+
+
+
+}
diff --git a/src/main/java/com/dsic/gj_erp/bean/sy/SyDictItem.java b/src/main/java/com/dsic/gj_erp/bean/sy/SyDictItem.java
index 465bd72..282b6af 100644
--- a/src/main/java/com/dsic/gj_erp/bean/sy/SyDictItem.java
+++ b/src/main/java/com/dsic/gj_erp/bean/sy/SyDictItem.java
@@ -1,7 +1,6 @@
package com.dsic.gj_erp.bean.sy;
-import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
@@ -12,7 +11,6 @@ import lombok.Data;
import lombok.EqualsAndHashCode;
import java.io.Serializable;
-import java.math.BigDecimal;
/**
*
diff --git a/src/main/java/com/dsic/gj_erp/bean/sy/SyLog.java b/src/main/java/com/dsic/gj_erp/bean/sy/SyLog.java
index 692c323..013ede4 100644
--- a/src/main/java/com/dsic/gj_erp/bean/sy/SyLog.java
+++ b/src/main/java/com/dsic/gj_erp/bean/sy/SyLog.java
@@ -3,7 +3,6 @@ package com.dsic.gj_erp.bean.sy;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.extension.activerecord.Model;
-
import com.dsic.gj_erp.annotation.Dict;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
diff --git a/src/main/java/com/dsic/gj_erp/bean/sy/SyMsg.java b/src/main/java/com/dsic/gj_erp/bean/sy/SyMsg.java
new file mode 100644
index 0000000..f0738d9
--- /dev/null
+++ b/src/main/java/com/dsic/gj_erp/bean/sy/SyMsg.java
@@ -0,0 +1,49 @@
+package com.dsic.gj_erp.bean.sy;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.persistence.Table;
+
+@Getter
+@Setter
+@Table
+public class SyMsg {
+ private String id;
+ //消息类型,41:月度计划下发;其他待定
+ //根据消息类型,属性为subDataX的字段分别代表不同含义
+ private String msgType;
+
+ private String subId;//发起人id
+
+ private String subName;//发起人姓名
+
+ private String subTime;//发起时间
+
+ private String subText;//发起内容
+
+ private String subData1;
+
+ private String subData2;
+
+ private String subData3;
+
+ private String subData4;
+
+ private String subData5;
+
+ private String handResult;//处理结果
+
+ private String handTime;//处理时间
+
+ private String handId;//处理人id
+
+ private String handName;//处理人
+
+ private String handAdv;//处理意见
+
+ private String zt;//状态,待定
+
+ private String memo;//备注
+
+}
diff --git a/src/main/java/com/dsic/gj_erp/bean/txzz/DmMateria.java b/src/main/java/com/dsic/gj_erp/bean/txzz/DmMateria.java
new file mode 100644
index 0000000..091cb15
--- /dev/null
+++ b/src/main/java/com/dsic/gj_erp/bean/txzz/DmMateria.java
@@ -0,0 +1,246 @@
+package com.dsic.gj_erp.bean.txzz;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+
+/**
+ *
+ * 物品基本表
+ *
+ *
+ * @author xhj
+ * @since 2021-03-29
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="DmMateria对象", description="物品基本表")
+public class DmMateria implements Serializable {
+
+ private static final long serialVersionUID=1L;
+
+ @TableId(value = "mat_no", type = IdType.INPUT)
+ @ApiModelProperty(value = "物品号")
+ private String matNo;
+
+ private String ylMatNo;//料卡用物品号/流程卡物品号
+ private String txMatNo;//铁舾物品号
+
+
+// @TableField(exist = false)
+// // 原来的物品号 物品号是主键
+// private String ymatNo;
+
+ @ApiModelProperty(value = "物品名称")
+ private String matName;
+
+ @ApiModelProperty(value = "规格")
+ private String matSpec;
+
+ @ApiModelProperty(value = "物资编码一级分类")
+ private String firstCateg;
+
+ @ApiModelProperty(value = "物资编码二级分类")
+ private String secondCateg;
+
+ @ApiModelProperty(value = "型号/标准号")
+ private String matVersion;
+
+ @ApiModelProperty(value = "材质")
+ private String matGrd;
+
+ @ApiModelProperty(value = "使用类型4级分类")
+ private String useCateg;
+// @Dict(dictTable ="dm_institution",dictText = "institution_name",dictCode = "institution_code")
+ @ApiModelProperty(value = "仓库三级分类")
+ private String institutionCode;
+
+ @ApiModelProperty(value = "净重量")
+ private BigDecimal jweight;
+
+ @ApiModelProperty(value = "毛重量")
+ private BigDecimal mweight;
+
+ @ApiModelProperty(value = "密度")
+ private BigDecimal density;
+
+ @ApiModelProperty(value = "面积")
+ private BigDecimal matArea;
+
+ @ApiModelProperty(value = "面积2")
+ private BigDecimal matArea1;
+
+ @ApiModelProperty(value = "核算计量单位")
+ private String hsUnit;
+
+ @ApiModelProperty(value = "制造部计量单位")
+ private String zzUnit;
+
+ @ApiModelProperty(value = "采购计量单位")
+ private String cgUnit;
+
+ @ApiModelProperty(value = "物品级别")
+ private String matLevel;
+
+// @Dict(dictCode = "WPLX")
+ @ApiModelProperty(value = "物品分类")
+ private String matCateg;
+
+ @ApiModelProperty(value = "采购分管部门")
+ private String cgDept;
+
+ @ApiModelProperty(value = "分管采购员")
+ private String cgRy;
+
+ @ApiModelProperty(value = "业务主管部门1")
+ private String mainDept1;
+
+ @ApiModelProperty(value = "业务主管部门")
+ private String mainDept;
+
+ @ApiModelProperty(value = "订货周期")
+ private Integer orderPeriod;
+
+ @ApiModelProperty(value = "领用周期")
+ private Integer usePeriod;
+
+ @ApiModelProperty(value = "采购常用标识")
+ private String cgFlag;
+
+ @ApiModelProperty(value = "tx标识")
+ private Integer txFlag;
+
+ @ApiModelProperty(value = "gj标识")
+ private Integer gjFlag;
+
+ @ApiModelProperty(value = "dy标识")
+ private Integer dyFlag;
+
+ @ApiModelProperty(value = "t1")
+ private BigDecimal t1;
+
+ private BigDecimal t2;
+
+ private BigDecimal b1;
+
+ private String b2;
+
+ @ApiModelProperty(value = "开工日期")
+ private String l;
+
+ @ApiModelProperty(value = "工艺备注")
+ private String craftRemark;
+
+ @ApiModelProperty(value = "面积公式")
+ private String areaFormula;
+
+ @ApiModelProperty(value = "体积公式")
+ private String volumeFormula;
+
+ @ApiModelProperty(value = "依据1")
+ private String gist1;
+
+ @ApiModelProperty(value = "依据2")
+ private String gist2;
+
+ @ApiModelProperty(value = "材料来处")
+ private String matFrom;
+
+ @ApiModelProperty(value = "零件来处")
+ private String piecesFrom;
+
+ @ApiModelProperty(value = "所属部门")
+ private String departCode;
+
+ @ApiModelProperty(value = "abc分类")
+ private String abcCateg;
+
+ @ApiModelProperty(value = "工艺识别号")
+ private String craftIdentifyNo;
+
+ @ApiModelProperty(value = "用户分类码")
+ private String usertypeStatus;
+
+ @ApiModelProperty(value = "使用状态")
+ private String useStatus;
+
+ private String bzry;
+
+ private String bzrq;
+
+ private String tjry;
+
+ private String tjrq;
+
+ private String spry;
+
+ @ApiModelProperty(value = "审批日期")
+ private String sprq;
+
+ @ApiModelProperty(value = "油漆稀释剂")
+ private String tmatCode;
+
+ @ApiModelProperty(value = "消耗率")
+ private BigDecimal consumeRate;
+
+ @ApiModelProperty(value = "固体含量")
+ private BigDecimal svt;
+
+ @ApiModelProperty(value = "油漆厂家")
+ private String factory;
+
+ @ApiModelProperty(value = "定额焊丝kg")
+ private BigDecimal fixedWire;
+
+ @ApiModelProperty(value = "焊点数量")
+ private Integer weldngNum;
+
+ @ApiModelProperty(value = "坡口数量")
+ private Integer grooveNum;
+
+ @ApiModelProperty(value = "翻口数量")
+ private Integer turnNum;
+ // 喷嘴
+ private String nozzleModel;
+
+ @ApiModelProperty(value = "混合使用期~r~nh/20℃")
+ private BigDecimal blendUse;
+
+ @ApiModelProperty(value = "稀释剂消耗率")
+ private BigDecimal tmatConsumeRate;
+
+ @ApiModelProperty(value = "备注")
+ private String remark;
+
+ @ApiModelProperty(value = "焊材重量")
+ private BigDecimal hczl;
+ //工艺类别（油漆使用）
+ private String gylb;
+
+ // 使用方式（在基础数据中导入附件信息 添加） gjjbs
+ private String useType;
+ // 安全库存（在基础数据中导入附件信息 添加）
+ private BigDecimal safekc;
+ // 最大库存（在基础数据中导入附件信息 添加）
+ private BigDecimal maxkc;
+
+ // 客户材料编码 在基础数据中导入附件信息 添加）
+ private String itemBm;
+
+
+ //购置类型
+ private String gzlx;
+
+ //附件级别
+ private String fjjb;
+
+ // 1,2,3,3
+ private String project;
+}
diff --git a/src/main/java/com/dsic/gj_erp/bean/txzz/DmProject.java b/src/main/java/com/dsic/gj_erp/bean/txzz/DmProject.java
new file mode 100644
index 0000000..0647fa9
--- /dev/null
+++ b/src/main/java/com/dsic/gj_erp/bean/txzz/DmProject.java
@@ -0,0 +1,190 @@
+package com.dsic.gj_erp.bean.txzz;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.dsic.gj_erp.annotation.Dict;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ *
+ * 船只信息
+ *
+ *
+ * @author xhj
+ * @since 2021-03-19
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="DmProject对象", description="船只信息")
+public class DmProject implements Serializable {
+
+ private static final long serialVersionUID=1L;
+ // qw.select("project","factory_area","classs","owner","project_type");
+
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+
+ @ApiModelProperty(value = "工程编号 Q11")
+
+ private String project;
+
+ @ApiModelProperty(value = "工程名称 Q12")
+ private String projectName;
+
+ @ApiModelProperty(value = "代替工程编号 订单打印导出时转换使用")
+ private String projectReplace;
+
+ @Dict(dictCode = "GCLX")
+ @ApiModelProperty(value = "船只类型 dict='GCLX'")
+ private String projectType;
+
+ @ApiModelProperty(value = "完工标识 N(默认)/Y")
+ private String finishFlag;
+
+ @ApiModelProperty(value = "系列")
+ private String series;
+
+ @ApiModelProperty(value = "简称")
+ private String sproject;
+
+ @Dict(dictCode = "GCQY")
+ @ApiModelProperty(value = "工厂区域 dict=''GCQY''")
+ private String factoryArea;
+
+ @ApiModelProperty(value = "船级社")
+ private String classs;
+
+ @ApiModelProperty(value = "船东")
+ private String owner;
+
+ @ApiModelProperty(value = "船检")
+ private String classSurveyor;
+
+ @ApiModelProperty(value = "管系基础船只")
+ private String gjProject;
+
+ @ApiModelProperty(value = "是否为首制船,0:否;1:是;")
+ private Integer firstMake;
+
+ @ApiModelProperty(value = "管系计调员")
+ private String gjOperator;
+
+ @ApiModelProperty(value = "铁舾基础船只")
+ private String txProject;
+
+ @ApiModelProperty(value = "铁舾计调员")
+ private String txOperator;
+
+ @ApiModelProperty(value = "是否按区域")
+ private String areaFlag;
+
+ @ApiModelProperty(value = "批号")
+ private String bathNo;
+
+ @ApiModelProperty(value = "批号1")
+ private String bathNo1;
+
+ @ApiModelProperty(value = "批号2")
+ private String bathNo2;
+
+ @ApiModelProperty(value = "批号3")
+ private String bathNo3;
+
+ @ApiModelProperty(value = "批号4")
+ private String bathNo4;
+
+ @ApiModelProperty(value = "批号5")
+ private String bathNo5;
+
+ @ApiModelProperty(value = "批号6")
+ private String bathNo6;
+
+ @ApiModelProperty(value = "批号7")
+ private String bathNo7;
+
+ @ApiModelProperty(value = "批号8")
+ private String bathNo8;
+
+ @ApiModelProperty(value = "安装区域")
+ private String area;
+
+ @ApiModelProperty(value = "工艺员")
+ private String craftBy;
+
+ @ApiModelProperty(value = "安装区域1")
+ private String area1;
+
+ @ApiModelProperty(value = "工艺员1")
+ private String craftBy1;
+
+ @ApiModelProperty(value = "安装区域2")
+ private String area2;
+
+ @ApiModelProperty(value = "工艺员2")
+ private String craftBy2;
+
+ @ApiModelProperty(value = "单元计调员")
+ private String dyOperator;
+
+ @ApiModelProperty(value = "开工日期")
+ private String startDate;
+
+ @ApiModelProperty(value = "开工日期依据")
+ private String startBasis;
+
+ @ApiModelProperty(value = "铺底日期")
+ private String bottomDate;
+
+ @ApiModelProperty(value = "铺底日期依据")
+ private String bottomBasis;
+
+ @ApiModelProperty(value = "下水日期")
+ private String waterDate;
+
+ @ApiModelProperty(value = "试航日期")
+ private String sailDate;
+
+ @ApiModelProperty(value = "签字交工日期")
+ private String signDate;
+
+ @ApiModelProperty(value = "管系工时标准")
+ private String gjgsStandard;
+
+ @ApiModelProperty(value = "管材系数")
+ private BigDecimal pipeFactor;
+
+ @ApiModelProperty(value = "管支架型材系数")
+ private BigDecimal pipeSupport;
+
+ @ApiModelProperty(value = "管系附件平库方式")
+ private BigDecimal pipeFlat;
+
+ @ApiModelProperty(value = "封账日期")
+ private String accountsDate;
+
+ @ApiModelProperty(value = "封装说明")
+ private String accountsExplain;
+
+ private String bzry;
+
+ private String bzrq;
+
+ private String remark;
+
+ @ApiModelProperty(value = "管系分图人员")
+ private String gjFty;
+ private String gjHly;
+ private String gjDey;
+ private String gjShy;
+ private String gjCky;
+
+
+
+
+}
diff --git a/src/main/java/com/dsic/gj_erp/bean/txzz/jhgl/TpbhPlan.java b/src/main/java/com/dsic/gj_erp/bean/txzz/jhgl/TpbhPlan.java
new file mode 100644
index 0000000..31a0eb0
--- /dev/null
+++ b/src/main/java/com/dsic/gj_erp/bean/txzz/jhgl/TpbhPlan.java
@@ -0,0 +1,383 @@
+package com.dsic.gj_erp.bean.txzz.jhgl;
+
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.Arrays;
+import java.util.List;
+
+@Getter
+@Setter
+@TableName("dm_tpbh_plan")
+public class TpbhPlan {
+ @TableId(type = IdType.ASSIGN_UUID)
+ private String id;//
+ @ExcelProperty("工程编号")
+ private String project;//工程编号 Q11 ERP=czbh
+
+ @ExcelProperty("区域")
+ private String zone;//区域 Q12 ERP=qy
+
+ @ExcelProperty("分段号")
+ private String blockNo;//分段号 暂不显示 ERP=fdh
+
+ @ExcelProperty("批号")
+ private String ph;//批号 Q21 ERP=ph
+
+ private String lckNo;//流程卡号 Q22 ERP=bh
+ private String planType;//计划类型 ERP=rwlx dict=‘ZYJHLX’ (作业计划类型 参考erp xtbm='rwjd')
+ private String scType;//施工类型 ERP=jglx dict=‘JGLX’ (施工类型 参考erp xtbm='jglx')
+ private String status;//计划状态 ERP=jhlx Q15 dict=‘ZYJHZT’ (作业计划状态 01-编制 02-下达) 默认01
+ private String kh;//卡号 ERP=kh 默认=批号 暂不显示
+
+ @ExcelProperty("托盘表号")
+ private String pmlNo;//托盘表号 ERP=tpbh 暂不使用
+ private String sscj;//所属车间 ERP=sscj 不用显示，关联制作图数据使用 默认赋值(02-管子 021-管支架)
+
+ @ExcelProperty("责任单位")
+ private String departCode;//责任单位 (默认查询限制 02-管系制造部)
+
+ @ExcelProperty("图纸类型")
+ private String dwgType;//图纸类型 Q25 ERP=xz dict='TZLX' (01-制作图 02-通知单 99-其他)
+
+ @ExcelProperty("制作图号")
+ private String dwgNo;//制作图号 ERP=zzth 暂不使用 铁舾使用
+
+ @ExcelProperty("部件代号")
+ private String itemNo;//部件代号 ERP=bjbh 暂不使用 铁舾使用
+
+ @ExcelProperty("部件名称")
+ private String itemName;//部件名称 ERP=bjmc 暂不使用 铁舾使用
+
+ @ExcelProperty("修正部件代号")
+ private String itemNo1;//部件代号 ERP=gysbh 暂不使用 铁舾使用(工艺识别号、修正部件代号)
+
+ @ExcelProperty("部件序号")
+ private String itemXh;//部件序号 ERP=bjxh 暂不使用 铁舾使用
+
+ @ExcelProperty("部件数量")
+ private String itemQty;//部件数量 ERP=gs
+ private String wkhour;//工时 ERP=jggs
+
+ @ExcelProperty("部件重量")
+ private String itemWgt;//总重量(KG) ERP=zzl
+ private String gcWgt;//管材重量(Kg) ERP=ds
+ private String fjWgt;//附件重量(KG) ERP=fjzl
+ private String hcWgt;//焊材重量(KG) ERP=hczl
+ private String gcInArea;//管材内表面积(㎡) ERP=gcnbmj
+ private String gcOutArea;//管材外表面积(㎡) ERP=gcwbmj
+
+ @ExcelProperty("内涂装面积")
+ private String itemInArea;//部件内表面积(㎡) (铁舾使用)
+
+ @ExcelProperty("外涂装面积")
+ private String itemOutArea;//部件外表面积(㎡) (铁舾使用)
+
+ @ExcelProperty("留焊区域")
+ private String itemLhArea;//留焊区域(㎡)* (铁舾使用)
+ private String hdsl;//焊点数 ERP=hdsl
+ private String zgsl;//支管数 ERP=zgsl
+ private String wqsl;//弯曲数 ERP=wqsl
+ private String pksl;//坡口翻边压槽数 ERP=pksl
+ private String itemShape;//管型 ERP=gzlx
+ private String itemType;//类型 ERP=bjlx
+
+ @ExcelProperty("产品类型")
+ private String prodType;//产品类型* ERP=cplx (铁舾使用)
+
+ @ExcelProperty("材质")
+ private String itemGrd;//材质 ERP=bjcz
+
+ @ExcelProperty("部件规格")
+ private String itemSpec;//规格 (规格范围) ERP=bjgg
+ private String jyyq;//探伤要求 ERP=jyyq
+ private String bybs;//磅压要求 ERP=bybs
+ private String jybs;//报验要求 ERP=jybs
+ private String tsbs;//探伤标识 ERP=tsbs
+
+ @ExcelProperty("处理方式")
+ private String treatmentType;//处理方式 ERP=tzfs
+ private String treatment;//表面处理 ERP=nbmcl
+ private String paintCode;//涂装代码 ERP=tzdm
+ private String inTreatment;//内表面处理 (暂不使用)
+
+ @ExcelProperty("内涂装代码")
+ private String inPaintCode;//内涂装代码 (暂不使用)
+ private String outTreatment;//外表面处理 (暂不使用) ERP=wbmcl
+
+ @ExcelProperty("外涂装代码")
+ private String outPaintCode;//外涂装代码 (暂不使用)
+ private String wkhourXl;//下料工时 ERP=C0201
+ private String wkhourWq;//弯曲工时 ERP=C0202
+ private String wkhourPt;//平台工时 ERP=C0203
+ private String wkhourHj;//焊接工时 ERP=C0204
+ private String wkhourQl;//清理工时 ERP=C0205
+ private String wkhourWg;//外观工时 ERP=C0206
+ private String wkhourBy;//磅压工时 ERP=C0207
+ private String wkhourZy;//转运工时 ERP=C0208
+
+ @ExcelProperty("制作单位")
+ private String scDept;//制作单位 ERP=sgdw (下拉选择 dmDepart 中parentCode='02' and 制作标识的 departCode )
+
+ @ExcelProperty("镀锌单位")
+ private String clDept;//表面处理单位 ERP=bmcldw (下拉选择 dmDepart 中 parentCode='02' and 处理标识的 departCode )
+ private String nclDept;//内表面处理单位 ERP=nbmcldw (下拉选择 dmDepart 中 parentCode='02' and 处理标识的 departCode )
+
+ @ExcelProperty("涂装单位")
+ private String tzDept;//涂装单位 (下拉选择 dmDepart 中 parentCode='02' and 处理标识的 departCode )
+
+ @ExcelProperty("配送单位")
+ private String psDept;//配送单位 ERP=psdw(下拉选择 dmDepart 中 parentCode='02' and 配送标识的 departCode )
+ private String gcdhrq;//管材到货日期* (暂不使用)
+ private String fjdhrq;//附件到货日期* (暂不使用)
+ private String jlry;//建立人员 ERP原来没有 生成作业计划时的流程卡审核人员
+ private String jlrq;//建立日期 ERP=jlrq 生成作业计划时的流程卡审核日期
+ private String csry;//测算人员 ERP=sgbz
+ private String cssj;//测算时间 ERP=sgbz
+ private String csfk;//测算下达标识* ERP=sfxd (是否下达，暂不使用)
+ private String fkrq;//发卡日期 ERP=fkrq
+ private String jhrqZzwg;//制作计划完工日期 ERP=jsrq
+ private String jhrqZzwg0;//初始计划完工日期 ERP=zyjhblwcsj
+ private String jhrqNclwg;//内处理完工计划日期
+ private String jhrqClwg;//处理完工计划日期
+ private String jhrqTzwg;//涂装完工计划日期* (暂不使用)
+ private String jhrqJpwg;//集配完工计划日期* (暂不使用)
+ private String xdry;//计划下达人员
+ private String xdrq;//计划下达日期
+ private String scjd;//生产进度 ERP=scjd
+ private String wgbs;//制作完工标识 ERP=wgbs 默认’‘/'完工'
+ private String wgrq;//制作完工日期 ERP=wgrq
+ private String xgStaus;//修改状态 ERP=zrr 默认''/'部分修改'/'整卡取消'
+ private String scStatus;//制作状态 ERP=zzzt dict='GXZZZT' 管系制作状态 ERP zhbmp=’HBZT‘
+
+ @ExcelProperty("备注")
+ private String remark;//备注 ERP=bz
+ private String scRemark;//作业区制作情况说明 ERP=wbmcl
+ private String scRemark0;//作业区上次反馈情况 ERP=ppfkrq
+ private String bzph;//班组制作批号 ERP=bzph
+ private String xlgw;//下料工位 ERP=xlgw
+ private String xljhrq;//下料计划日期 ERP=xljhrq
+ private String ptgw;//平台工位 ERP=ptgw
+ private String ptjhrq;//平台计划日期 ERP=ptjhrq
+ private String bzjhStatus;//班组计划状态 ERP=bzjhzt dict=‘BZJHZT’ (班组计划状态 01-编制 02-审核)
+ private String bzjhBzry;//班组计划编制人员 ERP=bzjhbzr
+ private String bzjhBzrq;//班组计划编制日期 ERP=bzjhbzq
+ private String bzjhShry;//班组计划审核人员 ERP=无
+ private String bzjhShrq;//班组计划审核日期 ERP=无
+ private String gclldh;//管材领料单号 ERP=lldh
+ private String fjlldh;//附件领料单号 ERP=fjlldh
+ private String lldbzry;//领料单编制人员 ERP=lldbzr
+ private String lldbzrq;//领料单编制日期 ERP=lldbzrq
+ private String hclldh;//焊材领料单号 ERP=hclldh
+ private String hclldbzry;//焊材领料单编制人员 ERP=hclldbzr
+ private String hclldbzrq;//焊材领料单编制日期 ERP=hclldbzrq
+ private String scryXl;//下料人员 ERP=xlry
+ private String scryWq;//弯曲人员 ERP=wqry
+ private String scryPt;//平台人员 ERP=ptry
+ private String scryHj;//焊接人员 ERP=hjry
+ private String scryQl;//清理人员 ERP=qlry
+ private String scryWg;//外观人员 ERP=wgry
+ private String scryBy;//磅压人员 ERP=byry
+ private String scryZy;//转运人员 ERP=zyry
+ private String aqfzXl;//下料安全责任人 ERP=xlaq
+ private String aqfzWq;//弯曲安全责任人 ERP=wqaq
+ private String aqfzPt;//平台安全责任人 ERP=ptaq
+ private String aqfzHj;//焊接安全责任人 ERP=hjaq
+ private String aqfzQl;//清理安全责任人 ERP=qlaq
+ private String aqfzWg;//外观安全责任人 ERP=wgaq
+ private String aqfzBy;//磅压安全责任人 ERP=byaq
+ private String aqfzZy;//转运安全责任人 ERP=zyaq
+ private String scFzry;//作业区长 ERP=bmry
+ private String wkhourXl1;//班组下料工时 ERP=D0201
+ private String wkhourWq1;//班组弯曲工时 ERP=D0202
+ private String wkhourPt1;//班组平台工时 ERP=D0203
+ private String wkhourHj1;//班组焊接工时 ERP=D0204
+ private String wkhourQl1;//班组清理工时 ERP=D0205
+ private String wkhourWg1;//班组外观工时 ERP=D0206
+ private String wkhourBy1;//班组磅压工时 ERP=D0207
+ private String wkhourZy1;//班组转运工时 ERP=D0208
+ private String backDate;//反卡日期
+ private String backMonth;//反卡月份
+ private String backRemark;//发卡备注
+
+ @ExcelProperty("前方需求日期")
+ private String qfxqrq;//前方需求日期2021116
+ private String jhrqZzwg1;//结构计划调整日期2021116
+ private String jhrqTzwg1;//涂装计划调整日期2021116
+ private String jhrqBlrq;//备料计划日期2021116
+
+ @ExcelProperty("机加计划日期")
+ private String jhrqJjrq;//机加计划日期2021116
+ private String jhrqClwg1;//镀锌计划调整日期2021116
+ private String jlrid;//建立人员ID2021116
+ private String csrid;//测算人员ID2021116
+ private String xdrid;//下达人员ID2021116
+ private String spry;//审批人员2021116
+ private String sprq;//审批日期2021116
+ private String sprid;//审批人ID2021116
+
+ @ExcelProperty("结构计划期")
+ private String jhrq;//结构计划日期2021116
+
+ @ExcelProperty("镀锌计划期")
+ private String dxrq;//镀锌计划日期2021116
+
+ @ExcelProperty("涂装计划日期")
+ private String tzrq;//涂装计划日期2021116
+
+ @ExcelProperty("入库计划期")
+ private String rkrq;//入库计划日期2021116
+ private String wgJhrq;//结构实际完工日期2021116
+ private String wgDxrq;//镀锌实际完工日期2021116
+ private String wgTzrq;//涂装实际完工日期2021116
+ private String wgRkrq;//入库实际完工日期2021116
+ private String jgzySl;//结构转运数量2021116
+ private String jgzyRy;//结构转运人员2021116
+ private String jgzyCh;//结构转运车号2021116
+ private String jgzyRq;//结构转运日期2021116
+ private String jgzyLsh;//结构转运单号2021116
+ private String dxzySl;//镀锌转运数量2021116
+ private String dxzyRy;//镀锌转运人员2021116
+ private String dxzyCh;//镀锌转运车号2021116
+ private String dxzyRq;//镀锌转运日期2021116
+ private String dxzyLsh;//镀锌转运单号2021116
+ private String tzzySl;//涂装转运数量2021116
+ private String tzzyRy;//涂装转运人员2021116
+ private String tzzyCh;//涂装转运车号2021116
+ private String tzzyRq;//涂装转运日期2021116
+ private String tzzyLsh;//结构转运单号2021116
+
+ //todo 缺少字段
+ @ExcelProperty("需求单位")
+ @TableField(exist = false)
+ private String ddepartCode;
+
+ @TableField(exist = false)
+ private boolean repeat;//是否重复提取
+
+ /**
+ * 导入时,数据校验
+ */
+ public boolean checkBaseParam(){
+ if (ObjectUtil.isEmpty(this.getProject())){
+ throw new RuntimeException("工程编号不能为空");
+ }
+ if (ObjectUtil.isEmpty(this.getDwgNo())){
+ throw new RuntimeException("制作图号不能为空");
+ }
+ if (ObjectUtil.isEmpty(this.getPmlNo())){
+ throw new RuntimeException("托盘表号不能为空");
+ }
+ if (ObjectUtil.isEmpty(this.getItemNo())){
+ throw new RuntimeException("部件代号不能为空");
+ }
+ if (ObjectUtil.isEmpty(this.getItemName())){
+ throw new RuntimeException("部件名称不能为空");
+ }
+ if (ObjectUtil.isEmpty(this.getItemSpec())){
+ throw new RuntimeException("部件规格不能为空");
+ }
+ return true;
+ }
+
+ /**
+ * 变更为提交状态
+ */
+ public void fixToSubmitStatus(){
+ this.status=StatusEnum.下达.code;
+ }
+
+ /**
+ * 变更为审核状态
+ */
+ public void fixToShStatus(){
+ this.status=StatusEnum.生产.code;
+ }
+
+ /**
+ * 变更为提交状态
+ */
+ public void fixToSpStatus(){
+ this.status=StatusEnum.运转.code;
+ }
+
+ @AllArgsConstructor
+ public enum StatusEnum{
+ 编制("01"),
+ 下达("02"),
+ 生产("03"),
+ 运转("04"),
+ 完工("05"),
+ 入库("06");
+ @Getter
+ private String code;
+ }
+
+ public void updateForSubmit(String userName, String userCode, String data){
+ this.fixToSubmitStatus();
+ this.setCsry(userName);
+ this.setCssj(data);
+ this.setCsrid(userCode);
+ }
+
+ public void updateForSh(String userName, String userCode, String data){
+ this.fixToShStatus();
+ this.setXdry(userName);
+ this.setXdrq(data);
+ this.setXdrid(userCode);
+ }
+
+ public void updateForSp(String userName, String userCode, String data){
+ this.fixToSpStatus();
+ this.setSpry(userName);
+ this.setSprq(data);
+ this.setSprid(userCode);
+ }
+
+ //保存时,提交时,结构计划期、涂装计划期、入库计划期不能为空
+ public boolean canSave(){
+ checkBaseParam();
+ if (!this.status.equals("01")){
+ return false;
+ }
+ if (StrUtil.isEmpty(this.jhrq)){
+ throw new RuntimeException("结构计划期为空");
+ }
+ if (StrUtil.isEmpty(this.tzrq)){
+ throw new RuntimeException("涂装计划期为空");
+ }
+ if (StrUtil.isEmpty(this.rkrq)){
+ throw new RuntimeException("入库计划期为空");
+ }
+ if (StrUtil.isEmpty(this.treatmentType)){
+ throw new RuntimeException("处理方式为空");
+ }
+ if (dxTreatmentTypeList.contains(this.treatmentType)&&StrUtil.isEmpty(this.dxrq)){
+ throw new RuntimeException("镀锌计划期为空");
+ }
+ return this.repeat;
+ }
+
+ public boolean canSubmit(){
+ return this.status.equals("01");
+ }
+
+ public boolean equals(TpbhPlan plan){
+ return ObjectUtil.isNotEmpty(plan)&&this.getProject().equals(plan.getProject())
+ &&this.getDwgNo().equals(plan.getDwgNo())
+ &&this.getDepartCode().equals(plan.getDepartCode())
+ &&this.getItemNo().equals(plan.getItemNo())
+ &&this.getPmlNo().equals(plan.getPmlNo());
+ }
+
+ //镀锌
+ public static List dxTreatmentTypeList= Arrays.asList("01","02","04","05");
+}
diff --git a/src/main/java/com/dsic/gj_erp/bean/xiaochi/CutPlan.java b/src/main/java/com/dsic/gj_erp/bean/xiaochi/CutPlan.java
index b5806dc..7c5e523 100644
--- a/src/main/java/com/dsic/gj_erp/bean/xiaochi/CutPlan.java
+++ b/src/main/java/com/dsic/gj_erp/bean/xiaochi/CutPlan.java
@@ -20,7 +20,7 @@ public class CutPlan extends Model {
private String nestName;
- private String nestNameSub1;//套料图号
+ private String nestNameSub1;//套料图号 _V:切割;_K:划线
private String nestItaatu;//厚
diff --git a/src/main/java/com/dsic/gj_erp/bean/zyjh/DmYppyz.java b/src/main/java/com/dsic/gj_erp/bean/zyjh/DmYppyz.java
new file mode 100644
index 0000000..056ef06
--- /dev/null
+++ b/src/main/java/com/dsic/gj_erp/bean/zyjh/DmYppyz.java
@@ -0,0 +1,56 @@
+package com.dsic.gj_erp.bean.zyjh;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.dsic.gj_erp.bean.jhgk.DmYdjh;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class DmYppyz extends Model {
+
+ @TableId(type = IdType.AUTO)
+ public Integer id;
+
+ public String dcCh;
+
+ private String dcPl;
+
+ private String dcFd;
+
+ private String kw;
+
+ private String zl;
+
+ private String tz;
+
+ private String lx;
+
+ private String xj;
+
+ private String ppch;//配盘船号
+
+ private String ypph;//预配盘号
+
+ private Integer dwxxId;
+
+ private StatusEnum status=StatusEnum.未设置垛位;
+
+ public static StatusEnum 已设置垛位状态(){
+ return StatusEnum.设置垛位;
+ }
+
+ public static DmYppyz of(DmYdjh ydjh){
+
+ DmYppyz dmYppyz = new DmYppyz();
+ BeanUtil.copyProperties(ydjh,dmYppyz);
+ return dmYppyz;
+ }
+
+ public enum StatusEnum{
+ 未设置垛位,设置垛位,已配送
+ }
+}
diff --git a/src/main/java/com/dsic/gj_erp/bean/zyjh/PwExcel.java b/src/main/java/com/dsic/gj_erp/bean/zyjh/PwExcel.java
new file mode 100644
index 0000000..de6629f
--- /dev/null
+++ b/src/main/java/com/dsic/gj_erp/bean/zyjh/PwExcel.java
@@ -0,0 +1,40 @@
+package com.dsic.gj_erp.bean.zyjh;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class PwExcel {
+
+ @ExcelProperty(value = "船号")
+ public String dcCh;
+
+ @ExcelProperty(value = "批量")
+ public String dcPl;
+
+ @ExcelProperty(value = "分段")
+ public String dcFd;
+
+ @ExcelProperty(value = "套料图号")
+ public String tlth;
+
+ @ExcelProperty(value = "备注")
+ public String bz;
+
+ @ExcelProperty(value = "理料垛位")
+ public String lldw;
+
+ @ExcelProperty(value = "理料层数")
+ private String llcs;
+
+ @ExcelProperty(value = "状态")
+ private String zt;
+
+
+ @ExcelProperty(value = "入库批号")
+ public String nbsmb;
+
+
+}
diff --git a/src/main/java/com/dsic/gj_erp/bean/zyjh/Ycldw.java b/src/main/java/com/dsic/gj_erp/bean/zyjh/Ycldw.java
new file mode 100644
index 0000000..f4c9d2d
--- /dev/null
+++ b/src/main/java/com/dsic/gj_erp/bean/zyjh/Ycldw.java
@@ -0,0 +1,41 @@
+package com.dsic.gj_erp.bean.zyjh;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.List;
+
+/**
+ * 预处理垛位
+ */
+@Getter
+@Setter
+public class Ycldw {
+
+ @TableId(type = IdType.AUTO)
+ private Integer id;
+ private String name;
+ private DwTypeEnum type;
+ private String tzbh;
+ private String kw;
+
+ @TableField(exist = false)
+ private List list;
+
+ public void setTypeForYcl(){
+ this.type=DwTypeEnum.YCL;
+ }
+
+ public static DwTypeEnum getTypeForYcl(){
+ return DwTypeEnum.YCL;
+ }
+
+ public enum DwTypeEnum{
+ YCL,//预处理垛位
+ LLJ,//理料间垛位
+ YPP,//预配盘垛位
+ }
+}
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
new file mode 100644
index 0000000..f921bcb
--- /dev/null
+++ b/src/main/java/com/dsic/gj_erp/bean/zyjh/YcldwInfo.java
@@ -0,0 +1,80 @@
+package com.dsic.gj_erp.bean.zyjh;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.date.DateUtil;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.dsic.gj_erp.controller.zyjh.dto.ShangLiao;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 预处理垛位层数信息
+ */
+@Getter
+@Setter
+public class YcldwInfo {
+
+ @TableId(type = IdType.AUTO)
+ private Integer id;
+
+ private Integer dwId;
+ private Integer ceng;
+
+ private String ydid;
+ private String czbh;
+ private String pl;
+ private String fd;
+ private String kw;
+ private String zl;
+ private String tlth;
+
+ private String wph;//对应材质
+ private String wlh;//对应物品号
+ private String lph;//对应物料号
+ private String wpgg;
+ private String nbsbm;//内码
+ private String sljhrq;
+ private String qgjhrq;
+ private String bfr;//摆放人
+ private String bfrq;//摆放日期
+ private ZtEnum zt;
+ private String djh;//工单号
+
+ public static YcldwInfo ofSl(ShangLiao sl){
+ YcldwInfo info=new YcldwInfo();
+ BeanUtil.copyProperties(sl,info);
+ info.setDjh(sl.getYdjh().getDjh());
+ info.sl();
+ return info;
+ }
+
+ public static YcldwInfo ofPwpg(YcldwInfo info){
+ YcldwInfo info1=new YcldwInfo();
+ info1.setId(info.getId());
+ info1.pwpg();
+ return info1;
+ }
+
+ private void sl(){
+ this.bfrq= DateUtil.date().toString("yyyy/MM/dd");
+ this.baifang();
+ }
+
+ public void baifang(){
+ this.zt=ZtEnum.BF;
+ }
+
+ private void pwpg(){
+ this.zt=ZtEnum.PG;
+ }
+
+ public void paowan(){
+ this.zt=ZtEnum.PW;
+ }
+
+ private enum ZtEnum{
+ //摆放,派工,抛丸
+ BF,PG,PW
+ }
+}
diff --git a/src/main/java/com/dsic/gj_erp/config/DynamicDataSourceConfig.java b/src/main/java/com/dsic/gj_erp/config/DynamicDataSourceConfig.java
index 7ba5509..5ac062e 100644
--- a/src/main/java/com/dsic/gj_erp/config/DynamicDataSourceConfig.java
+++ b/src/main/java/com/dsic/gj_erp/config/DynamicDataSourceConfig.java
@@ -3,12 +3,11 @@ package com.dsic.gj_erp.config;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.boot.jdbc.DataSourceBuilder;
import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Primary;
import javax.sql.DataSource;
-@Configuration
+//@Configuration
public class DynamicDataSourceConfig {
@Primary
@Bean("masterDataSource")
diff --git a/src/main/java/com/dsic/gj_erp/config/JapConfig.java b/src/main/java/com/dsic/gj_erp/config/JapConfig.java
index 3799e77..0624541 100644
--- a/src/main/java/com/dsic/gj_erp/config/JapConfig.java
+++ b/src/main/java/com/dsic/gj_erp/config/JapConfig.java
@@ -1,6 +1,7 @@
package com.dsic.gj_erp.config;
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.zaxxer.hikari.HikariDataSource;
import org.hibernate.boot.model.naming.Identifier;
import org.hibernate.boot.model.naming.PhysicalNamingStrategy;
import org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl;
@@ -10,7 +11,6 @@ import org.springframework.boot.autoconfigure.jdbc.DataSourceProperties;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.boot.jdbc.DataSourceBuilder;
import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
import org.springframework.core.env.Environment;
import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
import org.springframework.jdbc.datasource.init.DataSourceInitializer;
@@ -24,7 +24,7 @@ import javax.persistence.EntityManagerFactory;
import javax.sql.DataSource;
import java.util.Properties;
-@Configuration
+//@Configuration
@EnableJpaRepositories(
basePackages = "com.dsic.gj_erp",
entityManagerFactoryRef = "manEntityManagerFactory",
@@ -40,6 +40,7 @@ public class JapConfig {
return new DataSourceProperties();
}
+// @Primary
@Bean("jpaDataSource")
public DataSource jpaDataSource() {
DataSourceProperties manDataSourceProperties = japDataSourceProperties();
@@ -52,8 +53,8 @@ public class JapConfig {
}
@Bean
- public PlatformTransactionManager manTransactionManager() { //4
- EntityManagerFactory factory = manEntityManagerFactory().getObject();
+ public PlatformTransactionManager manTransactionManager(LocalContainerEntityManagerFactoryBean manEntityManagerFactory) { //4
+ EntityManagerFactory factory = manEntityManagerFactory.getObject();
JpaTransactionManager jpaTransactionManager = new JpaTransactionManager(factory);
System.out.println(jpaTransactionManager.isNestedTransactionAllowed());
return jpaTransactionManager;
@@ -70,10 +71,10 @@ public class JapConfig {
}
@Bean
- public LocalContainerEntityManagerFactoryBean manEntityManagerFactory() {
+ public LocalContainerEntityManagerFactoryBean manEntityManagerFactory(DataSource jpaDataSource) {
LocalContainerEntityManagerFactoryBean factory =
new LocalContainerEntityManagerFactoryBean();
- factory.setDataSource(jpaDataSource());
+ factory.setDataSource(jpaDataSource);
factory.setPackagesToScan("com.dsic.gj_erp");
factory.setJpaVendorAdapter(new HibernateJpaVendorAdapter());
Properties jpaProperties = new Properties();
@@ -87,9 +88,16 @@ public class JapConfig {
}
@Bean
- public DataSourceInitializer manDataSourceInitializer() {//6
+ public DataSourceInitializer manDataSourceInitializer(DataSource jpaDataSource) {//6
DataSourceInitializer dsInitializer = new DataSourceInitializer();
- dsInitializer.setDataSource(jpaDataSource());
+ HikariDataSource dataSource = (HikariDataSource) jpaDataSource;
+ dataSource.setConnectionTimeout(10000);
+ dataSource.setIdleTimeout(60000);
+ dataSource.setMaximumPoolSize(2000);
+ dataSource.setLeakDetectionThreshold(60000);
+ dataSource.setMinimumIdle(80);
+ dataSource.setMaxLifetime(300000);
+ dsInitializer.setDataSource(dataSource);
ResourceDatabasePopulator dbPopulator = new ResourceDatabasePopulator();
dsInitializer.setDatabasePopulator(dbPopulator);
dsInitializer.setEnabled(env.getProperty("spring.datasource.master.initialize",
diff --git a/src/main/java/com/dsic/gj_erp/config/MyBatisPlusConfigJiuZhou.java b/src/main/java/com/dsic/gj_erp/config/MyBatisPlusConfigJiuZhou.java
index 3b0ebfd..febe204 100644
--- a/src/main/java/com/dsic/gj_erp/config/MyBatisPlusConfigJiuZhou.java
+++ b/src/main/java/com/dsic/gj_erp/config/MyBatisPlusConfigJiuZhou.java
@@ -12,14 +12,13 @@ import org.mybatis.spring.SqlSessionTemplate;
import org.mybatis.spring.annotation.MapperScan;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
import org.springframework.jdbc.datasource.DataSourceTransactionManager;
import javax.sql.DataSource;
@MapperScan(basePackages = {"com.dsic.gj_erp.jiuzhoumapper"}, sqlSessionTemplateRef = "jiuzhouSqlSessionTemplate")
-@Configuration
+//@Configuration
public class MyBatisPlusConfigJiuZhou {
@Bean("jiuzhouSqlSessionFactory")
public SqlSessionFactory jiuzhouSqlSessionFactory(@Qualifier("jiuzhouDataSource") DataSource dataSource, MppSqlInjector mppSqlInjector) throws Exception {
diff --git a/src/main/java/com/dsic/gj_erp/config/MyBatisPlusConfigMaster.java b/src/main/java/com/dsic/gj_erp/config/MyBatisPlusConfigMaster.java
index ac21bae..be30e52 100644
--- a/src/main/java/com/dsic/gj_erp/config/MyBatisPlusConfigMaster.java
+++ b/src/main/java/com/dsic/gj_erp/config/MyBatisPlusConfigMaster.java
@@ -12,7 +12,6 @@ import org.mybatis.spring.SqlSessionTemplate;
import org.mybatis.spring.annotation.MapperScan;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Primary;
import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
import org.springframework.jdbc.datasource.DataSourceTransactionManager;
@@ -20,11 +19,11 @@ import org.springframework.jdbc.datasource.DataSourceTransactionManager;
import javax.sql.DataSource;
@MapperScan(basePackages = {"com.dsic.gj_erp.mapper"}, sqlSessionTemplateRef = "masterSqlSessionTemplate")
-@Configuration
+//@Configuration
public class MyBatisPlusConfigMaster {
@Primary
@Bean("masterSqlSessionFactory")
- public SqlSessionFactory masterSqlSessionFactory(@Qualifier("masterDataSource") DataSource dataSource, MppSqlInjector mppSqlInjector) throws Exception {
+ public SqlSessionFactory masterSqlSessionFactory(@Qualifier("jpaDataSource") DataSource dataSource, MppSqlInjector mppSqlInjector) throws Exception {
MybatisSqlSessionFactoryBean sqlSessionFactory = new MybatisSqlSessionFactoryBean();
sqlSessionFactory.setDataSource(dataSource);
@@ -47,7 +46,7 @@ public class MyBatisPlusConfigMaster {
@Primary
@Bean(name = "masterTransactionManager")
- public DataSourceTransactionManager masterTransactionManager(@Qualifier("masterDataSource") DataSource dataSource) {
+ public DataSourceTransactionManager masterTransactionManager(@Qualifier("jpaDataSource") DataSource dataSource) {
return new DataSourceTransactionManager(dataSource);
}
diff --git a/src/main/java/com/dsic/gj_erp/config/MyPhysicalNamingStrategy.java b/src/main/java/com/dsic/gj_erp/config/MyPhysicalNamingStrategy.java
index 685c5fb..b1facbb 100644
--- a/src/main/java/com/dsic/gj_erp/config/MyPhysicalNamingStrategy.java
+++ b/src/main/java/com/dsic/gj_erp/config/MyPhysicalNamingStrategy.java
@@ -1,7 +1,6 @@
package com.dsic.gj_erp.config;
import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import org.hibernate.boot.model.naming.Identifier;
import org.hibernate.boot.model.naming.PhysicalNamingStrategy;
import org.hibernate.engine.jdbc.env.spi.JdbcEnvironment;
diff --git a/src/main/java/com/dsic/gj_erp/controller/ApiController.java b/src/main/java/com/dsic/gj_erp/controller/ApiController.java
index 885bee9..f931326 100644
--- a/src/main/java/com/dsic/gj_erp/controller/ApiController.java
+++ b/src/main/java/com/dsic/gj_erp/controller/ApiController.java
@@ -1,18 +1,15 @@
package com.dsic.gj_erp.controller;
-import cn.hutool.core.util.StrUtil;
import com.dsic.gj_erp.annotation.AuthFunction;
import com.dsic.gj_erp.bean.ResultBean;
import com.dsic.gj_erp.bean.request.LoginBean;
-import com.dsic.gj_erp.bean.sy.User;
-import com.dsic.gj_erp.exception.CustomException;
import com.dsic.gj_erp.mapper.SyuserMapper;
import com.dsic.gj_erp.service.ApiService;
import com.dsic.gj_erp.service.sy.SYService;
-import com.dsic.gj_erp.util.IPUtils;
import com.dsic.gj_erp.util.MD5Util;
import io.swagger.annotations.Api;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -20,7 +17,6 @@ import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
import javax.servlet.http.HttpServletRequest;
-import java.net.InetAddress;
import java.util.Map;
@Api(tags = "系统级API")
@@ -52,6 +48,9 @@ public class ApiController {
return new ResultBean(apiService.userLogin(loginBean, request));
}
+ @Value("${zxtbm}")
+ public String zxtbm;
+
@AuthFunction
@RequestMapping(value = "/getInfo")
public ResultBean getInfo(HttpServletRequest request) {
@@ -61,7 +60,7 @@ public class ApiController {
Map map= apiService.getInfo(yhdm);
- map.put("menu", syuserMapper.getUserMenu(yhdm, zxtdm));
+ map.put("menu", syuserMapper.getUserMenu(yhdm, zxtbm));
return new ResultBean(map);
}
diff --git a/src/main/java/com/dsic/gj_erp/controller/SYController.java b/src/main/java/com/dsic/gj_erp/controller/SYController.java
index f5f7be2..9e900ac 100644
--- a/src/main/java/com/dsic/gj_erp/controller/SYController.java
+++ b/src/main/java/com/dsic/gj_erp/controller/SYController.java
@@ -1,12 +1,9 @@
package com.dsic.gj_erp.controller;
-import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.convert.Convert;
import com.alibaba.fastjson.JSONObject;
import com.dsic.gj_erp.annotation.AuthFunction;
import com.dsic.gj_erp.bean.ResultBean;
-import com.dsic.gj_erp.bean.jhgk.DmQfxq;
import com.dsic.gj_erp.bean.sy.*;
import com.dsic.gj_erp.service.sy.SYService;
import io.swagger.annotations.Api;
@@ -14,7 +11,10 @@ import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
import java.util.List;
import java.util.Map;
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/DmXqdwcjcdController.java b/src/main/java/com/dsic/gj_erp/controller/fd/DmXqdwcjcdController.java
new file mode 100644
index 0000000..4790e36
--- /dev/null
+++ b/src/main/java/com/dsic/gj_erp/controller/fd/DmXqdwcjcdController.java
@@ -0,0 +1,74 @@
+package com.dsic.gj_erp.controller.fd;
+
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.dsic.gj_erp.annotation.AuthFunction;
+import com.dsic.gj_erp.bean.ResultBean;
+import com.dsic.gj_erp.bean.fd.DmXqdwcjcd;
+import com.dsic.gj_erp.service.fd.DmXqdwcjcdService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+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 java.util.List;
+import java.util.Map;
+
+/**
+ *
+ * 前端控制器
+ *
+ *
+ * @author xhj
+ * @since 2023-06-16
+ */
+@RestController
+@RequestMapping("/api/dmXqdwcjcd")
+public class DmXqdwcjcdController {
+
+ @Autowired
+ DmXqdwcjcdService dmXqdwcjcdService;
+
+
+ @PostMapping("/getXqdwcjcdList")
+ @AuthFunction
+ public ResultBean getXqdwcjcdList(@RequestBody Map map){
+ QueryWrapperqw= new QueryWrapper<>();
+ qw.eq(StrUtil.isNotEmpty((String)map.get("cjmc")),"cjmc",(String)map.get("cjmc"));
+ qw.eq(StrUtil.isNotEmpty((String)map.get("cdmc")),"cdmc",(String)map.get("cdmc"));
+ qw.eq(StrUtil.isNotEmpty((String)map.get("dwbm")),"dwbm",(String)map.get("dwbm"));
+ qw.orderBy(true,true,"dwbm","cjmc","cdmc");
+ List list = dmXqdwcjcdService.list(qw);
+ return new ResultBean(list);
+ }
+
+ @PostMapping("/saveXqdwcjcd")
+ @AuthFunction
+ @Transactional(rollbackFor = Exception.class)
+ public ResultBean saveXqdwcjcd(@RequestBody Listlist){
+ dmXqdwcjcdService.saveBatch(list);
+ return new ResultBean();
+ }
+
+ @PostMapping("/updateXqdwcjcd")
+ @AuthFunction
+ @Transactional(rollbackFor = Exception.class)
+ public ResultBean updateXqdwcjcd(@RequestBody Listlist){
+ dmXqdwcjcdService.updateBatchById(list);
+ return new ResultBean();
+ }
+
+ @PostMapping("/delXqdwcjcd")
+ @AuthFunction
+ @Transactional(rollbackFor = Exception.class)
+ public ResultBean delXqdwcjcd(@RequestBody Listlist){
+ list.forEach(e->{
+ dmXqdwcjcdService.removeById(e.getCdid());
+ });
+ return new ResultBean();
+ }
+
+}
+
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