From 1f8dc3f0b4ac0a56c86c1b2a47c71f64932c54d7 Mon Sep 17 00:00:00 2001
From: xiaoning <1097449274@qq.com>
Date: Fri, 13 Oct 2023 11:19:41 +0800
Subject: [PATCH] wanghaodong
---
.idea/workspace.xml | 330 ++++++++++++++++--
.../com/dsic/gj_erp/bean/jhgk/DmQfxq.java | 73 ++++
.../com/dsic/gj_erp/bean/jhgk/DmSygd.java | 269 ++++++++++----
.../com/dsic/gj_erp/bean/jhgk/DmSygdMx.java | 231 ++++++------
.../dsic/gj_erp/bean/jhgk/excel/QfExcel.java | 75 ++++
.../dsic/gj_erp/bean/jhgk/excel/SyExcel.java | 202 +++++++++++
.../controller/jhgk/DmQfxqController.java | 113 ++++++
.../controller/jhgk/DmSygdController.java | 21 +-
.../controller/jhgk/DmSygdMxController.java | 46 ++-
.../gj_erp/listeners/ExcelQFListener.java | 111 ++++++
.../gj_erp/listeners/ExcelSYListener.java | 107 ++++++
.../dsic/gj_erp/mapper/jhgk/DmQfxqMapper.java | 17 +
.../dsic/gj_erp/mapper/jhgk/DmSygdMapper.java | 2 +-
.../gj_erp/mapper/jhgk/DmSygdMxMapper.java | 2 +-
.../gj_erp/service/jhgk/DmQfxqService.java | 23 ++
.../gj_erp/service/jhgk/DmSygdMxService.java | 9 +-
.../gj_erp/service/jhgk/DmSygdService.java | 10 +-
.../service/jhgk/impl/DmQfxqServiceImpl.java | 50 +++
.../jhgk/impl/DmSygdMxServiceImpl.java | 255 +++++++++++++-
.../service/jhgk/impl/DmSygdServiceImpl.java | 97 ++++-
.../resources/mappers/jhgk/DmQfxqMapper.xml | 20 ++
.../resources/mappers/jhgk/DmSygdMapper.xml | 112 ++++--
.../resources/mappers/jhgk/DmSygdMxMapper.xml | 64 +---
23 files changed, 1915 insertions(+), 324 deletions(-)
create mode 100644 src/main/java/com/dsic/gj_erp/bean/jhgk/DmQfxq.java
create mode 100644 src/main/java/com/dsic/gj_erp/bean/jhgk/excel/QfExcel.java
create mode 100644 src/main/java/com/dsic/gj_erp/bean/jhgk/excel/SyExcel.java
create mode 100644 src/main/java/com/dsic/gj_erp/controller/jhgk/DmQfxqController.java
create mode 100644 src/main/java/com/dsic/gj_erp/listeners/ExcelQFListener.java
create mode 100644 src/main/java/com/dsic/gj_erp/listeners/ExcelSYListener.java
create mode 100644 src/main/java/com/dsic/gj_erp/mapper/jhgk/DmQfxqMapper.java
create mode 100644 src/main/java/com/dsic/gj_erp/service/jhgk/DmQfxqService.java
create mode 100644 src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmQfxqServiceImpl.java
create mode 100644 src/main/resources/mappers/jhgk/DmQfxqMapper.xml
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index ea38b77..9c7b508 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -5,10 +5,199 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -31,47 +220,84 @@
+
+
+
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -85,6 +311,19 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -92,6 +331,13 @@
+
+
+
+
@@ -126,6 +372,22 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
1695345779307
@@ -213,7 +475,6 @@
-
@@ -227,13 +488,10 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
\ No newline at end of file
diff --git a/src/main/java/com/dsic/gj_erp/bean/jhgk/DmQfxq.java b/src/main/java/com/dsic/gj_erp/bean/jhgk/DmQfxq.java
new file mode 100644
index 0000000..02d365f
--- /dev/null
+++ b/src/main/java/com/dsic/gj_erp/bean/jhgk/DmQfxq.java
@@ -0,0 +1,73 @@
+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;
+
+/**
+ *
+ *
+ *
+ *
+ * @author xn
+ * @since 2023-09-18
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="DmQfxq对象", description="")
+public class DmQfxq implements Serializable {
+
+ private static final long serialVersionUID=1L;
+
+ @ApiModelProperty(value = "船名")
+ @TableField("DC_CH")
+ private String dcCh;
+
+ @ApiModelProperty(value = "批量")
+ @TableField("DC_PL")
+ private String dcPl;
+
+ @ApiModelProperty(value = "分段")
+ @TableField("DC_FD")
+ private String dcFd;
+
+ @ApiModelProperty(value = "配送场地")
+ private String pscd;
+
+ @ApiModelProperty(value = "车间主管")
+ private String cjzg;
+
+ @ApiModelProperty(value = "大板")
+ private String db;
+
+ @ApiModelProperty(value = "型材")
+ private String xc;
+
+ @ApiModelProperty(value = "T型材")
+ private String txc;
+
+ @ApiModelProperty(value = "备注")
+ private String bz;
+
+ @ApiModelProperty(value = "状态")
+ private String zt;
+
+ @TableId(value = "id", type = IdType.ASSIGN_UUID)
+ private String id;
+
+ @ApiModelProperty(value = "编制人员")
+ private String bzry;
+ @ApiModelProperty(value = "编制日期")
+ private String bzrq;
+ @ApiModelProperty(value = "审核人员")
+ private String shry;
+ @ApiModelProperty(value = "审核日期")
+ private String shrq;
+
+}
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 9436670..797b8aa 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
@@ -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;
@@ -8,6 +9,7 @@ import lombok.Data;
import lombok.EqualsAndHashCode;
import java.io.Serializable;
+import java.util.List;
/**
*
@@ -15,7 +17,7 @@ import java.io.Serializable;
*
*
* @author xn
- * @since 2023-09-15
+ * @since 2023-10-09
*/
@Data
@EqualsAndHashCode(callSuper = false)
@@ -24,122 +26,235 @@ public class DmSygd implements Serializable {
private static final long serialVersionUID=1L;
- @ApiModelProperty(value = "产品")
- private String dcCh1;
+ @ApiModelProperty(value = "船号")
+ @TableField("DC_CH")
+ private String dcCh;
- @ApiModelProperty(value = "目标船只")
- private String dcCh2;
-
- @ApiModelProperty(value = "本船只")
- private String dcCh3;
+ @ApiModelProperty(value = "分段号")
+ @TableField("DC_FD")
+ private String dcFd;
- @ApiModelProperty(value = "批量")
+ @ApiModelProperty(value = "批量号")
+ @TableField("DC_PL")
private String dcPl;
- @ApiModelProperty(value = "分段")
- private String dcFd;
+ @ApiModelProperty(value = "钢加大组结束")
+ private String gjjsDz;
+
+ @ApiModelProperty(value = "钢加小组结束")
+ private String gjjsXz;
+
+ @ApiModelProperty(value = "钢加开始")
+ private String gjks;
+
+ @ApiModelProperty(value = "套料图接收")
+ private String jsqTlt;
+
+ @ApiModelProperty(value = "板材领取表接收")
+ private String jsqLqb;
+
+ @ApiModelProperty(value = "订货清单号")
+ private String dhqd;
+
+ @ApiModelProperty(value = "状态；0编辑 1提交 2下发 3完成 4拖期")
+ private String gdZt="0";
+
+ @ApiModelProperty(value = "订货板数")
+ private Double orderBs;
- @ApiModelProperty(value = "板数")
- private Double bs;
+ @ApiModelProperty(value = "到货板数")
+ private Double arrivalBs;
- @ApiModelProperty(value = "到货数量")
- private Double dhsl;
+ @ApiModelProperty(value = "套料图板数")
+ private int tltSl;
- @ApiModelProperty(value = "在途数量")
- private Double ztsl;
+ @ApiModelProperty(value = "上料张数")
+ private int slSl;
- @ApiModelProperty(value = "生产下发期")
- private String scxfq;
+ @ApiModelProperty(value = "上料时间")
+ private String slSj;
+
+ @ApiModelProperty(value = "抛丸数量")
+ private int pwSl;
+
+ @ApiModelProperty(value = "抛丸时间")
+ private String pwSj;
@ApiModelProperty(value = "型材抛丸")
- private String xcpw;
+ private Double xcpwSl;
+
+ @ApiModelProperty(value = "型材抛丸时间")
+ private String xcpwSj;
+
+ @ApiModelProperty(value = "1跨平直大板（大组）")
+ private int n1ad;
+
+ @ApiModelProperty(value = "加工时间")
+ private String n1adSj;
+
+ @ApiModelProperty(value = "1跨平直大板（小组）")
+ private int n1ax;
+
+ @ApiModelProperty(value = "加工时间")
+ private String n1axSj;
+
+ @ApiModelProperty(value = "1跨进线板（大组）")
+ private int n1ld;
+
+ @ApiModelProperty(value = "加工时间")
+ private String n1ldSj;
+
+ @ApiModelProperty(value = "2跨超长超宽板（大组）")
+ private int n2bd;
- @ApiModelProperty(value = "根数")
- private Double gs;
+ @ApiModelProperty(value = "加工时间")
+ private String n2bdSj;
- @ApiModelProperty(value = "抛丸")
- private String pw;
+ @ApiModelProperty(value = "2跨超长超宽板（小组）")
+ private int n2bx;
- @ApiModelProperty(value = "坡口切割结束")
- private String pkjs1;
+ @ApiModelProperty(value = "加工时间")
+ private String n2bxSj;
- @ApiModelProperty(value = "二垮数控板数")
- private Double skbs1;
+ @ApiModelProperty(value = "2跨超长超宽曲板（小组）")
+ private int n2cx;
- @ApiModelProperty(value = "数控切割开始")
- private String skks1;
+ @ApiModelProperty(value = "加工时间")
+ private String n2cxSj;
- @ApiModelProperty(value = "坡口长度")
- private Double pkcd1;
+ @ApiModelProperty(value = "2跨超长超宽曲板（大组）")
+ private int n2cd;
- @ApiModelProperty(value = "坡口切割结束")
- private String pkjs2;
+ @ApiModelProperty(value = "加工时间")
+ private String n2cdSj;
- @ApiModelProperty(value = "三垮数控板数")
- private Double skbs2;
+ @ApiModelProperty(value = "2跨T型材腹板（小组）")
+ private int n2tx;
- @ApiModelProperty(value = "数控切割开始")
- private String skks2;
+ @ApiModelProperty(value = "加工时间")
+ private String n2txSj;
- @ApiModelProperty(value = "坡口长度")
- private Double pkcd2;
+ @ApiModelProperty(value = "2跨T型材腹板（大组）")
+ private int n2td;
- @ApiModelProperty(value = "坡口切割结束")
- private String pkjs3;
+ @ApiModelProperty(value = "加工时间")
+ private String n2tdSj;
- @ApiModelProperty(value = "三垮平铁板数")
- private Double ptbs;
+ @ApiModelProperty(value = "2跨激光切割板（小组）")
+ private int n2jx;
- @ApiModelProperty(value = "平铁切割开始")
- private String ptks;
+ @ApiModelProperty(value = "加工时间")
+ private String n2jxSj;
- @ApiModelProperty(value = "平铁切割结束")
- private String ptjs;
+ @ApiModelProperty(value = "2跨激光切割板（大组）")
+ private int n2jd;
- @ApiModelProperty(value = "曲平铁转结束")
- private String qptzjs;
+ @ApiModelProperty(value = "加工时间")
+ private String n2jdSj;
- @ApiModelProperty(value = "曲平铁结束")
- private String qptjs;
+ @ApiModelProperty(value = "3跨曲板（小组）")
+ private int n3cx;
- @ApiModelProperty(value = "曲外板结束")
- private String qwbjs;
+ @ApiModelProperty(value = "加工时间")
+ private String n3cxSj;
- @ApiModelProperty(value = "组立")
- private String zl;
+ @ApiModelProperty(value = "3跨曲板（大组）")
+ private int n3cd;
- @ApiModelProperty(value = "数控 板数")
- private Double skbs3;
+ @ApiModelProperty(value = "加工时间")
+ private String n3cdSj;
- @ApiModelProperty(value = "数控切割开始")
- private String skks3;
+ @ApiModelProperty(value = "3跨厚板（小组）")
+ private int n3hx;
- @ApiModelProperty(value = "坡口长度")
- private Double pkcd3;
+ @ApiModelProperty(value = "加工时间")
+ private String n3hxSj;
- @ApiModelProperty(value = "坡口切割结束")
- private String pkjs4;
+ @ApiModelProperty(value = "3跨厚板（大组）")
+ private int n3hd;
- @ApiModelProperty(value = "面板挤边")
- private String mbjb;
+ @ApiModelProperty(value = "加工时间")
+ private String n3hdSj;
- @ApiModelProperty(value = "七垮型材米数")
- private Double xcms;
+ @ApiModelProperty(value = "4跨普通板（小组）")
+ private int n4px;
- @ApiModelProperty(value = "型材面板")
- private String xcmb;
+ @ApiModelProperty(value = "加工时间")
+ private String n4pxSj;
- @ApiModelProperty(value = "分段需求")
- private String fdxqq;
+ @ApiModelProperty(value = "4跨普通板（大组）")
+ private int n4pd;
- @ApiModelProperty(value = "光电 结束")
- private String gdjs;
+ @ApiModelProperty(value = "加工时间")
+ private String n4pdSj;
- @ApiModelProperty(value = "备注")
- private String bz;
+ @ApiModelProperty(value = "4跨普通板（机器人）")
+ private int n4xx;
+ @ApiModelProperty(value = "加工时间")
+ private String n4xxSj;
+
+ @ApiModelProperty(value = "光电")
+ private int n8gx;
+
+ @ApiModelProperty(value = "加工时间")
+ private String n8gxSj;
+
+ @ApiModelProperty(value = "7跨型板（小组）")
+ private Double x7xx;
+
+ @ApiModelProperty(value = "加工时间")
+ private String x7xxSj;
+
+ @ApiModelProperty(value = "7跨型板（大组）")
+ private Double x7xd;
+
+ @ApiModelProperty(value = "加工时间")
+ private String x7xdSj;
+
+ @ApiModelProperty(value = "2跨T型材面板（小组）")
+ private int s2tx;
+
+ @ApiModelProperty(value = "加工时间")
+ private String s2txSj;
+
+ @ApiModelProperty(value = "2跨T型材面板（大组）")
+ private int s2td;
+
+ @ApiModelProperty(value = "加工时间")
+ private String s2tdSj;
+
+ @ApiModelProperty(value = "3跨平铁（小组）")
+ private int s3px;
+
+ @ApiModelProperty(value = "加工时间")
+ private String s3pxSj;
+
+ @ApiModelProperty(value = "3跨平铁（大组）")
+ private int s3pd;
+
+ @ApiModelProperty(value = "加工时间")
+ private String s3pdSj;
+
+ @ApiModelProperty(value = "3跨平铁（机器人）")
+ private int s3xx;
+
+ @ApiModelProperty(value = "加工时间")
+ private String s3xxSj;
+
+ @ApiModelProperty(value = "计划大组完成时间")
+ private String jhwgDz;
+
+ @ApiModelProperty(value = "计划小组完成时间")
+ private String jhwgXz;
+
+ @ApiModelProperty(value = "数据来源船")
+ private String sjlyCh;
+ @ApiModelProperty(value = "数据更新时间")
+ private String gxsj;
@TableId(value = "id", type = IdType.ASSIGN_UUID)
private String id;
-
+ @TableField(exist = false)
+ private List mxList;
}
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 8363f2d..cc84bda 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
@@ -9,6 +9,7 @@ import lombok.Data;
import lombok.EqualsAndHashCode;
import java.io.Serializable;
+import java.math.BigDecimal;
/**
*
@@ -16,7 +17,7 @@ import java.io.Serializable;
*
*
* @author xn
- * @since 2023-09-15
+ * @since 2023-10-09
*/
@Data
@EqualsAndHashCode(callSuper = false)
@@ -26,188 +27,182 @@ public class DmSygdMx implements Serializable {
private static final long serialVersionUID=1L;
@ApiModelProperty(value = "产品")
- private String dcCh1;
-
- @ApiModelProperty(value = "目标船只")
- private String dcCh2;
+ private String dcCh;
- @ApiModelProperty(value = "本船只")
- private String dcCh3;
+ @ApiModelProperty(value = "数据来源船")
+ private String dcCh1;
@ApiModelProperty(value = "批量")
private String dcPl;
- @ApiModelProperty(value = "分段")
- private String dcFd;
-
- @ApiModelProperty(value = "类型")
+ @ApiModelProperty(value = "领取类型")
@TableField("LQLB")
private String lqlb;
- @ApiModelProperty(value = "板数")
- private Double bs;
-
@ApiModelProperty(value = "套料图号")
private String tzbh;
- @ApiModelProperty(value = "集团计划期")
- private String jtjhq;
-
- @ApiModelProperty(value = "分段需求期")
- private String fdxqq;
-
@ApiModelProperty(value = "规格")
private String wpgg;
@ApiModelProperty(value = "材质")
private String wpxh;
- @ApiModelProperty(value = "到货数量")
- private Double dhsl;
-
- @ApiModelProperty(value = "在途数量")
- private Double ztsl;
-
- @ApiModelProperty(value = "生产下发期")
- private String scxfq;
+ @ApiModelProperty(value = "划线长度(米)")
+ private BigDecimal hxcd;
- @ApiModelProperty(value = "长度（毫米）")
- private Double cd;
+ @ApiModelProperty(value = "切割长度（米）")
+ private BigDecimal qgcd;
- @ApiModelProperty(value = "面积（平方米）")
- private Double mj;
+ @ApiModelProperty(value = "曲标识")
+ private String qbs;
- @ApiModelProperty(value = "抛丸计划完工")
- private String jhwgPw;
+ @ApiModelProperty(value = "坡口类型")
+ private String pklx;
- @ApiModelProperty(value = "施工单位")
- @TableField("ZZCJ")
- private String zzcj;
+ @ApiModelProperty(value = "坡口长度")
+ private Double pkcd;
- @ApiModelProperty(value = "理料")
- private String llrq;
+ @ApiModelProperty(value = "零件数量")
+ private BigDecimal ljsl;
- @ApiModelProperty(value = "划线长度(米)")
- private Double hxcd;
+ @ApiModelProperty(value = "组立")
+ private String zl;
- @ApiModelProperty(value = "切割长度（米）")
- private Double qgcd;
+ @ApiModelProperty(value = "加工类型")
+ private String lx;
- @ApiModelProperty(value = "板厚（毫米）")
- private Double bh;
+ @ApiModelProperty(value = "型材米数")
+ private BigDecimal xcms;
- @ApiModelProperty(value = "曲标识")
- private String qbs;
+ @ApiModelProperty(value = "跨位")
+ private String kw;
- @ApiModelProperty(value = "坡口标识")
- private String pkbs;
+ @ApiModelProperty(value = "上料日期")
+ private String slrq;
- @ApiModelProperty(value = "打磨标识")
- private String dmbs;
+ @ApiModelProperty(value = "上料人员")
+ private String slry;
- @ApiModelProperty(value = "一垮龙门板数")
- private Double lm1k;
+ @ApiModelProperty(value = "抛丸")
+ private String pw;
- @ApiModelProperty(value = "一垮龙门完工")
- private String wg1klm;
+ @ApiModelProperty(value = "抛丸人员")
+ private String pwry;
- @ApiModelProperty(value = "一垮数控板数")
- private Double lksk;
+ @ApiModelProperty(value = "抛丸日期")
+ private String pwrq;
- @ApiModelProperty(value = "一垮数控完工")
- private String wgLksk;
+ @ApiModelProperty(value = "划线设备")
+ private String hxsb;
- @ApiModelProperty(value = "坡口长度")
- private Double pkcd;
+ @ApiModelProperty(value = "划线人员")
+ private String hxry;
- @ApiModelProperty(value = "坡口计划完工")
- private String jhwgPk;
+ @ApiModelProperty(value = "划线日期")
+ private String hxrq;
- @ApiModelProperty(value = "二垮数控板数")
- private Double lm2k;
+ @ApiModelProperty(value = "切割设备")
+ private String qgsb;
- @ApiModelProperty(value = "二垮数控完工")
- private String wg2klm;
+ @ApiModelProperty(value = "切割人员")
+ private String qgry;
- @ApiModelProperty(value = "坡口长度")
- private Double pkcd2;
+ @ApiModelProperty(value = "切割日期")
+ private String qgrq;
- @ApiModelProperty(value = "坡口计划完工")
- private String jhwgPk2;
+ @ApiModelProperty(value = "打磨长度")
+ private Double dmcd;
- @ApiModelProperty(value = "三垮数控板数")
- private Double lm3k;
+ @ApiModelProperty(value = "打磨设备")
+ private String dmsb;
- @ApiModelProperty(value = "三垮数控完工")
- private String wg3klm;
+ @ApiModelProperty(value = "打磨人员")
+ private String dmry;
- @ApiModelProperty(value = "坡口长度")
- private Double pkcd3;
+ @ApiModelProperty(value = "打磨日期")
+ private String dmrq;
- @ApiModelProperty(value = "坡口计划完工")
- private String jhwgPk3;
+ @ApiModelProperty(value = "坡口设备")
+ private String pksb;
- @ApiModelProperty(value = "三垮平铁板数")
- private Double pt3k;
+ @ApiModelProperty(value = "坡口人员")
+ private String pkry;
- @ApiModelProperty(value = "三垮平铁完工")
- private String wg3kpt;
+ @ApiModelProperty(value = "坡口日期")
+ private String pkrq;
- @ApiModelProperty(value = "零件面积")
- private Double ljmj;
+ @ApiModelProperty(value = "抛丸设备")
+ private String pwsb;
+ @ApiModelProperty(value = "分段号")
+ @TableField("DC_FD")
+ private String dcFd;
- @ApiModelProperty(value = "零件数量")
- private Double ljsl;
+ @ApiModelProperty(value = "钢加大组结束")
+ private String gjjsDz;
- @ApiModelProperty(value = "曲平铁转结束")
- private String qptzjs;
+ @ApiModelProperty(value = "钢加小组结束")
+ private String gjjsXz;
- @ApiModelProperty(value = "曲平铁结束")
- private String qptjs;
+ @ApiModelProperty(value = "套料图接收")
+ private String jsqTlt;
- @ApiModelProperty(value = "曲外板结束")
- private String qwbjs;
+ @ApiModelProperty(value = "领取表接收")
+ private String jsqLqb;
- @ApiModelProperty(value = "组立")
- private String zl;
+ @ApiModelProperty(value = "订货清单号")
+ private String dhqd;
- @ApiModelProperty(value = "数控 板数")
- private Double skbs3;
+ @ApiModelProperty(value = "订货数量")
+ private Double orderBs;
- @ApiModelProperty(value = "数控切割开始")
- private String skks3;
+ @ApiModelProperty(value = "到货数量")
+ private Double arrivalBs;
- @ApiModelProperty(value = "坡口长度")
- private Double pkcd4;
+ @ApiModelProperty(value = "区域")
+ private String qy;
- @ApiModelProperty(value = "坡口切割结束")
- private String pkjs4;
+ @ApiModelProperty(value = "矫正标识")
+ private String jzbs;
- @ApiModelProperty(value = "面板挤边")
- private String mbjb;
+ @ApiModelProperty(value = "矫正设备")
+ private String jzsb;
- @ApiModelProperty(value = "七垮型材米数")
- private Double xcms;
+ @ApiModelProperty(value = "矫正人员")
+ private String jzry;
- @ApiModelProperty(value = "型材面板")
- private String xcmb;
+ @ApiModelProperty(value = "曲加工设备")
+ private String qjgsb;
- @ApiModelProperty(value = "分段需求")
- private String fdxq;
+ @ApiModelProperty(value = "曲加工人员")
+ private String qjgry;
- @ApiModelProperty(value = "光电 结束")
- private String gdjs;
+ @ApiModelProperty(value = "曲加工日期")
+ private String qjgrq;
- @ApiModelProperty(value = "备注")
- private String bz;
+ @ApiModelProperty(value = "本船号")
+ @TableField("dcCh2")
+ private String dcCh2;
- @ApiModelProperty(value = "状态")
- private String zt;
+ @ApiModelProperty(value = "钢加开始")
+ private String gjks;
+
+ @ApiModelProperty(value = "时间更新时间")
+ private String gxsj;
+ @ApiModelProperty(value = "结束时间")
+ private String jssj;
+ @ApiModelProperty(value = "矫正日期")
+ private String jzrq;
+ @ApiModelProperty(value = "划线空程长度")
+ private String hxcdCk;
+ @ApiModelProperty(value = "切割空程长度")
+ private String qgcdCk;
+ @ApiModelProperty(value = "状态；0编辑 1提交 2下发 3完成 4拖期")
+ private String zt="0";
private String parentId;
@TableId(value = "id", type = IdType.ASSIGN_UUID)
private String id;
-
}
diff --git a/src/main/java/com/dsic/gj_erp/bean/jhgk/excel/QfExcel.java b/src/main/java/com/dsic/gj_erp/bean/jhgk/excel/QfExcel.java
new file mode 100644
index 0000000..6f49bcb
--- /dev/null
+++ b/src/main/java/com/dsic/gj_erp/bean/jhgk/excel/QfExcel.java
@@ -0,0 +1,75 @@
+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.TableId;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+
+/**
+ *
+ *
+ *
+ *
+ * @author xn
+ * @since 2023-09-18
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="DmQfxq对象", description="")
+public class QfExcel implements Serializable {
+
+ private static final long serialVersionUID=1L;
+
+ @ApiModelProperty(value = "船名")
+ @ExcelProperty(index = 0)
+ private String dcCh;
+
+ @ApiModelProperty(value = "批量")
+ @ExcelProperty(index = 1)
+ private String dcPl;
+
+ @ApiModelProperty(value = "分段")
+ @ExcelProperty(index = 2)
+ private String dcFd;
+
+ @ApiModelProperty(value = "配送场地")
+ @ExcelProperty(index = 3)
+ private String pscd;
+
+ @ApiModelProperty(value = "车间主管")
+ @ExcelProperty(index = 4)
+ private String cjzg;
+
+ @ApiModelProperty(value = "大板")
+ @ExcelProperty(index = 5)
+ @DateTimeFormat("yyyy/MM/dd")
+ private String db;
+
+ @ApiModelProperty(value = "型材")
+ @ExcelProperty(index = 6)
+ @DateTimeFormat("yyyy/MM/dd")
+ private String xc;
+
+ @ApiModelProperty(value = "T型材")
+ @ExcelProperty(index = 7)
+ @DateTimeFormat("yyyy/MM/dd")
+ private String txc;
+
+ @ApiModelProperty(value = "备注")
+ @ExcelProperty(index = 8)
+ private String bz;
+
+ @ApiModelProperty(value = "状态")
+ private String zt;
+
+ @TableId(value = "id", type = IdType.ASSIGN_UUID)
+ private String id;
+
+
+}
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
new file mode 100644
index 0000000..30b59e9
--- /dev/null
+++ b/src/main/java/com/dsic/gj_erp/bean/jhgk/excel/SyExcel.java
@@ -0,0 +1,202 @@
+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.TableId;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+
+/**
+ *
+ *
+ *
+ *
+ * @author xn
+ * @since 2023-09-15
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="DmSygd对象", description="")
+public class SyExcel implements Serializable {
+
+ private static final long serialVersionUID=1L;
+
+ @ApiModelProperty(value = "产品")
+ @ExcelProperty(index = 1)
+ private String dcCh1;
+
+ @ApiModelProperty(value = "目标船只")
+ @ExcelProperty(index = 2)
+ private String dcCh2;
+
+ @ApiModelProperty(value = "本船只")
+ @ExcelProperty(index = 3)
+ private String dcCh3;
+
+ @ApiModelProperty(value = "批量")
+ @ExcelProperty(index = 4)
+ private String dcPl;
+
+ @ApiModelProperty(value = "分段")
+ @ExcelProperty(index = 5)
+ private String dcFd;
+
+ @ApiModelProperty(value = "板数")
+ @ExcelProperty(index = 6)
+ private Double bs;
+
+ @ApiModelProperty(value = "到货数量")
+ @ExcelProperty(index = 7)
+ private Double dhsl;
+
+ @ApiModelProperty(value = "在途数量")
+ @ExcelProperty(index = 8)
+ private Double ztsl;
+
+ @ApiModelProperty(value = "生产下发期")
+ @ExcelProperty(index = 9)
+ @DateTimeFormat("yyyy/MM/dd")
+ private String scxfq;
+
+ @ApiModelProperty(value = "型材抛丸")
+ @ExcelProperty(index = 10)
+ private String xcpw;
+
+ @ApiModelProperty(value = "根数")
+ @ExcelProperty(index = 11)
+ private Double gs;
+
+ @ApiModelProperty(value = "抛丸")
+ @ExcelProperty(index = 12)
+ private String pw;
+
+ @ApiModelProperty(value = "坡口切割结束")
+ @ExcelProperty(index = 13)
+ @DateTimeFormat("yyyy/MM/dd")
+ private String pkjs1;
+
+ @ApiModelProperty(value = "二垮数控板数")
+ @ExcelProperty(index = 14)
+ private String skbs1;
+
+ @ApiModelProperty(value = "数控切割开始")
+ @ExcelProperty(index = 15)
+ @DateTimeFormat("yyyy/MM/dd")
+ private String skks1;
+
+ @ApiModelProperty(value = "坡口长度")
+ @ExcelProperty(index = 16)
+ private Double pkcd1;
+
+ @ApiModelProperty(value = "坡口切割结束")
+ @ExcelProperty(index = 17)
+ @DateTimeFormat("yyyy/MM/dd")
+ private String pkjs2;
+
+ @ApiModelProperty(value = "三垮数控板数")
+ @ExcelProperty(index = 18)
+ private String skbs2;
+
+ @ApiModelProperty(value = "数控切割开始")
+ @ExcelProperty(index = 19)
+ @DateTimeFormat("yyyy/MM/dd")
+ private String skks2;
+
+ @ApiModelProperty(value = "坡口长度")
+ @ExcelProperty(index = 20)
+ private Double pkcd2;
+
+ @ApiModelProperty(value = "坡口切割结束")
+ @ExcelProperty(index = 21)
+ @DateTimeFormat("yyyy/MM/dd")
+ private String pkjs3;
+
+ @ApiModelProperty(value = "三垮平铁板数")
+ @ExcelProperty(index = 22)
+ private String ptbs;
+
+ @ApiModelProperty(value = "平铁切割开始")
+ @ExcelProperty(index = 23)
+ @DateTimeFormat("yyyy/MM/dd")
+ private String ptks;
+
+ @ApiModelProperty(value = "平铁切割结束")
+ @ExcelProperty(index = 24)
+ @DateTimeFormat("yyyy/MM/dd")
+ private String ptjs;
+
+ @ApiModelProperty(value = "曲平铁转结束")
+ @ExcelProperty(index = 25)
+ @DateTimeFormat("yyyy/MM/dd")
+ private String qptzjs;
+
+ @ApiModelProperty(value = "曲平铁结束")
+ @ExcelProperty(index = 26)
+ @DateTimeFormat("yyyy/MM/dd")
+ private String qptjs;
+
+ @ApiModelProperty(value = "曲外板结束")
+ @ExcelProperty(index = 27)
+ @DateTimeFormat("yyyy/MM/dd")
+ private String qwbjs;
+
+ @ApiModelProperty(value = "组立")
+ @ExcelProperty(index = 28)
+ @DateTimeFormat("yyyy/MM/dd")
+ private String zl;
+
+ @ApiModelProperty(value = "数控板数")
+ @ExcelProperty(index = 29)
+ private String skbs3;
+
+ @ApiModelProperty(value = "数控切割开始")
+ @ExcelProperty(index = 30)
+ @DateTimeFormat("yyyy/MM/dd")
+ private String skks3;
+
+ @ApiModelProperty(value = "坡口长度")
+ @ExcelProperty(index = 31)
+ private Double pkcd3;
+
+ @ApiModelProperty(value = "坡口切割结束")
+ @ExcelProperty(index = 32)
+ @DateTimeFormat("yyyy/MM/dd")
+ private String pkjs4;
+
+ @ApiModelProperty(value = "面板挤边")
+ @ExcelProperty(index = 33)
+ @DateTimeFormat("yyyy/MM/dd")
+ private String mbjb;
+
+ @ApiModelProperty(value = "七垮型材米数")
+ @ExcelProperty(index = 34)
+ private Double xcms;
+
+ @ApiModelProperty(value = "型材面板")
+ @ExcelProperty(index = 35)
+ private String xcmb;
+
+ @ApiModelProperty(value = "分段需求")
+ @ExcelProperty(index = 36)
+ @DateTimeFormat("yyyy/MM/dd")
+ private String fdxqq;
+
+ @ApiModelProperty(value = "光电 结束")
+ @ExcelProperty(index = 37)
+ @DateTimeFormat("yyyy/MM/dd")
+ private String gdjs;
+
+ @ApiModelProperty(value = "备注")
+ @ExcelProperty(index = 38)
+ private String bz;
+
+ @TableId(value = "id", type = IdType.ASSIGN_UUID)
+ private String id;
+
+
+}
diff --git a/src/main/java/com/dsic/gj_erp/controller/jhgk/DmQfxqController.java b/src/main/java/com/dsic/gj_erp/controller/jhgk/DmQfxqController.java
new file mode 100644
index 0000000..3d9a865
--- /dev/null
+++ b/src/main/java/com/dsic/gj_erp/controller/jhgk/DmQfxqController.java
@@ -0,0 +1,113 @@
+package com.dsic.gj_erp.controller.jhgk;
+
+
+import cn.hutool.core.util.StrUtil;
+import com.alibaba.excel.EasyExcel;
+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.jcsj.DmCbxxp;
+import com.dsic.gj_erp.bean.jhgk.DmQfxq;
+import com.dsic.gj_erp.bean.jhgk.excel.QfExcel;
+import com.dsic.gj_erp.exception.CustomException;
+import com.dsic.gj_erp.listeners.ExcelQFListener;
+import com.dsic.gj_erp.service.jcsj.DmCbxxpService;
+import com.dsic.gj_erp.service.jhgk.DmQfxqService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+
+/**
+ *
+ * 前端控制器
+ *
+ *
+ * @author xn
+ * @since 2023-09-18
+ */
+@RestController
+@RequestMapping("/dmQfxq")
+public class DmQfxqController {
+
+ @Autowired
+ DmQfxqService service;
+ @Autowired
+ DmCbxxpService cbxxpService;
+ //查询
+ @RequestMapping("/getList")
+ @AuthFunction
+ public ResultBean getList(@RequestBody DmQfxq qfxq){
+ List list=service.list(new QueryWrapper()
+ .eq(StrUtil.isNotEmpty(qfxq.getDcCh()),"DC_CH",qfxq.getDcCh())
+ .eq(StrUtil.isNotEmpty(qfxq.getZt()),"zt",qfxq.getZt())
+ .eq(StrUtil.isNotEmpty(qfxq.getDcPl()),"DC_PL",qfxq.getDcPl()));
+ return new ResultBean(list);
+ }
+
+ @RequestMapping("/getCzxx")
+ @AuthFunction
+ public ResultBean getCzxx(){
+ List list= cbxxpService.list(new QueryWrapper().select("cbbm","cbmc").orderBy(true, true, "cbbm"));
+ return new ResultBean(list);
+ }
+ //导入
+ @PostMapping("/upload")
+ @AuthFunction
+ @ResponseBody
+ public ResultBean uploadQf(@RequestParam("file") MultipartFile file , String czbh, HttpServletRequest req) throws Exception, CustomException {
+
+ ExcelQFListener objectListener = new ExcelQFListener();
+ EasyExcel.read(file.getInputStream(), QfExcel.class, objectListener).sheet(0).headRowNumber(1).doRead();
+ List objList = objectListener.getObjectList();
+ service.uploadQf(objList,czbh,req);
+ return new ResultBean();
+ }
+
+ //保存
+ @RequestMapping("/save")
+ @AuthFunction
+ public ResultBean save(@RequestBody List qfxqs){
+ service.saveBatch(qfxqs);
+ return new ResultBean();
+ }
+ //删除
+ @RequestMapping("/remove")
+ @AuthFunction
+ public ResultBean remove(@RequestBody List qfxqs){
+ service.removeByIds(qfxqs);
+ return new ResultBean();
+ }
+ //提交/退回
+ @RequestMapping("/qfxqTJ")
+ @AuthFunction
+ public ResultBean qfxqTJ(@RequestBody List qfxqs){
+ qfxqs.forEach(q->{
+ if (q.getZt().equals("0")) {
+ q.setZt("1");
+ return;
+ }
+ if (q.getZt().equals("1")){
+ q.setZt("0");
+ }
+ });
+ service.updateBatchById(qfxqs);
+ return new ResultBean();
+ }
+ //审核
+ @RequestMapping("/qfxqSH")
+ @AuthFunction
+ public ResultBean qfxqSH(@RequestBody List qfxqs){
+ qfxqs.forEach(q->{
+ if (q.getZt().equals("1")) {
+ q.setZt("2");
+ }
+ });
+ service.updateBatchById(qfxqs);
+ return new ResultBean();
+ }
+
+
+}
diff --git a/src/main/java/com/dsic/gj_erp/controller/jhgk/DmSygdController.java b/src/main/java/com/dsic/gj_erp/controller/jhgk/DmSygdController.java
index 4264161..5a20957 100644
--- a/src/main/java/com/dsic/gj_erp/controller/jhgk/DmSygdController.java
+++ b/src/main/java/com/dsic/gj_erp/controller/jhgk/DmSygdController.java
@@ -1,20 +1,39 @@
package com.dsic.gj_erp.controller.jhgk;
+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.jhgk.DmQfxq;
+import com.dsic.gj_erp.bean.jhgk.DmSygd;
+import com.dsic.gj_erp.service.jhgk.DmSygdService;
+import com.dsic.gj_erp.service.sy.SYService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
+import javax.annotation.Resource;
+import java.util.List;
+
/**
*
* 前端控制器
*
*
* @author xn
- * @since 2023-09-15
+ * @since 2023-10-09
*/
@RestController
@RequestMapping("/dmSygd")
public class DmSygdController {
+ @Resource
+ DmSygdService service;
+
+
+
+
}
diff --git a/src/main/java/com/dsic/gj_erp/controller/jhgk/DmSygdMxController.java b/src/main/java/com/dsic/gj_erp/controller/jhgk/DmSygdMxController.java
index 0af45c7..be8388c 100644
--- a/src/main/java/com/dsic/gj_erp/controller/jhgk/DmSygdMxController.java
+++ b/src/main/java/com/dsic/gj_erp/controller/jhgk/DmSygdMxController.java
@@ -1,20 +1,64 @@
package com.dsic.gj_erp.controller.jhgk;
+import com.dsic.gj_erp.annotation.AuthFunction;
+import com.dsic.gj_erp.bean.ResultBean;
+import com.dsic.gj_erp.bean.jhgk.DmSygd;
+import com.dsic.gj_erp.bean.jhgk.DmSygdMx;
+import com.dsic.gj_erp.service.jhgk.DmSygdMxService;
+import com.dsic.gj_erp.service.sy.SYService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.util.HashMap;
+import java.util.List;
+
/**
*
* 前端控制器
*
*
* @author xn
- * @since 2023-09-15
+ * @since 2023-10-09
*/
@RestController
@RequestMapping("/dmSygdMx")
public class DmSygdMxController {
+ @Autowired
+ private DmSygdMxService service;
+
+ @Resource
+ SYService syService;
+ @RequestMapping("/getList")
+ @AuthFunction
+ public ResultBean getList(@RequestBody DmSygd sygd){
+ String[] str=new String[50];
+ String[] str1=new String[50];
+ for (int i = 0; i < 50; i++) {
+ str[i]=syService.f_getpjh("DM", "SYSTEM", "BCHX");
+ str1[i]=syService.f_getpjh("DM", "SYSTEM", "CLDE");
+ }
+ for (String s:str){
+ System.out.println(s);
+ }
+
+ return new ResultBean();
+ }
+ @RequestMapping("/sygdPC")
+ @AuthFunction
+ public ResultBean sygdPC(){
+ return new ResultBean(service.sygdPC());
+ }
+
+ @RequestMapping("/saveByDcch")
+ @AuthFunction
+ public ResultBean saveByDcch(@RequestBody HashMap> map ){
+ return new ResultBean(service.saveByDcch(map));
+ }
}
diff --git a/src/main/java/com/dsic/gj_erp/listeners/ExcelQFListener.java b/src/main/java/com/dsic/gj_erp/listeners/ExcelQFListener.java
new file mode 100644
index 0000000..73cd9e6
--- /dev/null
+++ b/src/main/java/com/dsic/gj_erp/listeners/ExcelQFListener.java
@@ -0,0 +1,111 @@
+package com.dsic.gj_erp.listeners;
+
+import com.alibaba.excel.context.AnalysisContext;
+import com.alibaba.excel.event.AnalysisEventListener;
+import com.dsic.gj_erp.bean.jhgk.excel.QfExcel;
+import com.dsic.gj_erp.util.ObjConvertUtils;
+import org.apache.commons.lang3.StringUtils;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Excel通用监听器
+ */
+public class ExcelQFListener extends AnalysisEventListener {
+
+ private static final int BATCH_COUNT = 5;
+
+ List objectList = new ArrayList<>();
+ List