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
new file mode 100644
index 0000000..c036902
--- /dev/null
+++ b/src/main/java/com/dsic/gj_erp/bean/jcsj/DmBchxjbp.java
@@ -0,0 +1,141 @@
+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 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-20
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("DM_BCHXJBP")
+@ApiModel(value="DmBchxjbp对象", description="")
+public class DmBchxjbp implements Serializable {
+
+ private static final long serialVersionUID=1L;
+
+ @ApiModelProperty(value = "船号")
+ @TableField("DC_CH")
+ private String dcCh;
+
+ @ApiModelProperty(value = "船名")
+ @TableField("DC_CM")
+ private String dcCm;
+
+ @ApiModelProperty(value = "批量")
+ @TableField("DC_FD")
+ private String dcFd;
+
+ @ApiModelProperty(value = "批量")
+ @TableField("DC_PL")
+ private String dcPl;
+
+ @ApiModelProperty(value = "组立")
+ @TableField("DC_ZL")
+ private String dcZl;
+
+ @ApiModelProperty(value = "材料名称")
+ @TableField("CLMC")
+ private String clmc;
+
+ @ApiModelProperty(value = "原图纸编号")
+ @TableField("TZBH1")
+ private String tzbh1;
+
+ @TableField("SHZL")
+ private Double shzl;
+
+ @TableField("ZYRQ")
+ private String zyrq;
+
+ @TableField("GCBH")
+ private String gcbh;
+
+ @TableField("HXCD")
+ private BigDecimal hxcd;
+
+ @TableField("TXBL")
+ private String txbl;
+
+ @TableField("ZDRQ")
+ private String zdrq;
+
+ @TableField("YLZD3")
+ private String ylzd3;
+
+ @TableField("WPGG")
+ private String wpgg;
+
+ @TableField("LJSL")
+ private BigDecimal ljsl;
+
+ @TableField("DC_LPH")
+ private String dcLph;
+
+ @TableField("YLZD6")
+ private Double ylzd6;
+
+ @TableField("TZBH")
+ private String tzbh;
+
+ @TableField("CLZL")
+ private Double clzl;
+
+ @TableField("HXFL")
+ private String hxfl;
+
+ @TableField("XTRQ")
+ private String xtrq;
+
+ @TableField("WPXH")
+ private String wpxh;
+
+ @TableField("YLZD1")
+ private String ylzd1;
+
+ @TableField("YLZD4")
+ private BigDecimal ylzd4;
+
+ @TableField("YCLZL")
+ private Double yclzl;
+
+ @TableField("BZ")
+ private String bz;
+
+ @TableField("YLZD5")
+ private Double ylzd5;
+
+ @TableId(value = "HXBH", type = IdType.ASSIGN_UUID)
+ private String hxbh;
+
+ @TableField("YLZL")
+ private Double ylzl;
+
+ @TableField("ZDR")
+ private String zdr;
+
+ @TableField("YLBH")
+ private String ylbh;
+
+ @TableField("WGRQ")
+ private String wgrq;
+
+ @TableField("YLZD2")
+ private String ylzd2;
+
+
+}
diff --git a/src/main/java/com/dsic/gj_erp/bean/jcsj/DmBchxmxp.java b/src/main/java/com/dsic/gj_erp/bean/jcsj/DmBchxmxp.java
new file mode 100644
index 0000000..72dd1b4
--- /dev/null
+++ b/src/main/java/com/dsic/gj_erp/bean/jcsj/DmBchxmxp.java
@@ -0,0 +1,252 @@
+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 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-20
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("DM_BCHXMXP")
+@ApiModel(value="DmBchxmxp对象", description="")
+public class DmBchxmxp implements Serializable {
+
+ private static final long serialVersionUID=1L;
+
+ @ApiModelProperty(value = "序号")
+ @TableId(value = "XH", type = IdType.ASSIGN_UUID)
+ private Double xh;
+
+ @ApiModelProperty(value = "零件编号")
+ @TableField("WPH")
+ private String wph;
+
+ @ApiModelProperty(value = "数量")
+ @TableField("SL")
+ private BigDecimal sl;
+
+ @ApiModelProperty(value = "修改人")
+ @TableField("XGR")
+ private String xgr;
+
+ @ApiModelProperty(value = "修改日期")
+ @TableField("XGRQ")
+ private String xgrq;
+
+ @ApiModelProperty(value = "零件信息")
+ @TableField("LJXX")
+ private String ljxx;
+
+ @ApiModelProperty(value = "零件特征")
+ private String ljtz;
+
+ @ApiModelProperty(value = "工厂编号")
+ @TableField("GCBH_z")
+ private String gcbhZ;
+
+ @ApiModelProperty(value = "船号")
+ @TableField("DC_CH_z")
+ private String dcChZ;
+
+ @ApiModelProperty(value = "船名")
+ @TableField("DC_CM_z")
+ private String dcCmZ;
+
+ @ApiModelProperty(value = "分段")
+ @TableField("DC_FD_z")
+ private String dcFdZ;
+
+ @ApiModelProperty(value = "批量")
+ @TableField("DC_PL_z")
+ private String dcPlZ;
+
+ @ApiModelProperty(value = "组立")
+ @TableField("DC_ZL_z")
+ private String dcZlZ;
+
+ @ApiModelProperty(value = "图纸编号")
+ @TableField("TJBH_z")
+ private String tjbhZ;
+
+ @ApiModelProperty(value = "下图日期")
+ @TableField("XTRQ_z")
+ private String xtrqZ;
+
+ @ApiModelProperty(value = "余料编号")
+ @TableField("YLBH_z")
+ private String ylbhZ;
+
+ @ApiModelProperty(value = "规格")
+ @TableField("WPGG_z")
+ private String wpggZ;
+
+ @ApiModelProperty(value = "材质")
+ @TableField("WPXH_z")
+ private String wpxhZ;
+
+ @ApiModelProperty(value = "图形比例")
+ @TableField("TXBL_z")
+ private String txblZ;
+
+ @ApiModelProperty(value = "零件数量")
+ @TableField("LJSL_z")
+ private BigDecimal ljslZ;
+
+ @ApiModelProperty(value = "材料重量")
+ @TableField("YCLZL_z")
+ private Double yclzlZ;
+
+ @ApiModelProperty(value = "实耗重量")
+ @TableField("SHZL_z")
+ private Double shzlZ;
+
+ @ApiModelProperty(value = "残料重量")
+ @TableField("CLZL_z")
+ private Double clzlZ;
+
+ @ApiModelProperty(value = "余料重量")
+ @TableField("YLZL_z")
+ private Double ylzlZ;
+
+ @ApiModelProperty(value = "划线长度")
+ @TableField("HXCD_z")
+ private BigDecimal hxcdZ;
+
+ @ApiModelProperty(value = "炉批号")
+ @TableField("DC_LPH_z")
+ private String dcLphZ;
+
+ @ApiModelProperty(value = "完工日期")
+ @TableField("WGRQ_z")
+ private String wgrqZ;
+
+ @ApiModelProperty(value = "作业人员")
+ @TableField("ZYRQ_z")
+ private String zyrqZ;
+
+ @ApiModelProperty(value = "划线类型")
+ @TableField("YLZD1_z")
+ private String ylzd1Z;
+
+ @ApiModelProperty(value = "材料来源")
+ @TableField("YLZD2_z")
+ private String ylzd2Z;
+
+ @ApiModelProperty(value = "切割长度")
+ @TableField("YLZD4_z")
+ private BigDecimal ylzd4Z;
+
+ @ApiModelProperty(value = "划线分类")
+ @TableField("HXFL_z")
+ private String hxflZ;
+
+ @ApiModelProperty(value = "材料名称")
+ @TableField("CLMC_z")
+ private String clmcZ;
+
+ @ApiModelProperty(value = "原图纸编号")
+ @TableField("TZBH1_z")
+ private String tzbh1Z;
+
+ @ApiModelProperty(value = "原图纸编号")
+ @TableField("TZBH_z")
+ private String tzbhZ;
+
+ @ApiModelProperty(value = "状态：0:编辑1:提交2:审核")
+ private String zt;
+
+ @ApiModelProperty(value = "跨位")
+ @TableField("ZZCJ")
+ private String zzcj;
+
+ @ApiModelProperty(value = "打孔数量")
+ private Integer dksl;
+
+ @ApiModelProperty(value = "切割空程长度")
+ private Double cdQgkc;
+
+ @ApiModelProperty(value = "坡口标识")
+ private String pkbs;
+
+ @ApiModelProperty(value = "坡口类型")
+ private String pklx;
+
+ @ApiModelProperty(value = "坡口度数")
+ private Double pkds;
+
+ @ApiModelProperty(value = "坡口长度")
+ private Double cdPk;
+
+ @ApiModelProperty(value = "打磨标识")
+ private String dmbs;
+
+ @ApiModelProperty(value = "打磨长度")
+ private Double cdDm;
+
+ @ApiModelProperty(value = "曲面标识")
+ private String qmbs;
+
+ @TableField("YLZD3")
+ private String ylzd3;
+
+ @TableField("ZDR_z")
+ private String zdrZ;
+
+ @TableField("YLZD6")
+ private Double ylzd6;
+
+ @TableField("BZ")
+ private String bz;
+
+ @TableField("YLZD4")
+ private Double ylzd4;
+
+ @TableField("YLZD5_z")
+ private Double ylzd5Z;
+
+ @TableField("YLZD1")
+ private String ylzd1;
+
+ @TableField("ZDRQ_z")
+ private String zdrqZ;
+
+ @TableField("LJBH")
+ private String ljbh;
+
+ @TableField("YLZD6_z")
+ private Double ylzd6Z;
+
+ @TableField("YLZD3_z")
+ private String ylzd3Z;
+
+ @TableField("YLZD2")
+ private String ylzd2;
+
+ @TableField("HXBH")
+ private String hxbh;
+
+ @TableField("BZ_z")
+ private String bzZ;
+
+ @TableField("YLZD5")
+ private Double ylzd5;
+
+ private int drcs;
+
+
+}
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
new file mode 100644
index 0000000..2e88e25
--- /dev/null
+++ b/src/main/java/com/dsic/gj_erp/bean/jcsj/DmBchxylp.java
@@ -0,0 +1,133 @@
+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 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-19
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="DmBchxylp对象", description="")
+public class DmBchxylp implements Serializable {
+
+ private static final long serialVersionUID=1L;
+
+ @ApiModelProperty(value = "余料编号(板材)")
+ private String ylbh;
+
+ @ApiModelProperty(value = "套料图号")
+ private String tzbh;
+
+ @ApiModelProperty(value = "类型")
+ private String hxfl;
+
+ @ApiModelProperty(value = "规格")
+ private String wpgg;
+
+ @ApiModelProperty(value = "材质")
+ private String wpxh;
+
+ @ApiModelProperty(value = "备注")
+ private String bz;
+
+ @ApiModelProperty(value = "导入人")
+ private String zdr;
+
+ @ApiModelProperty(value = "导入日期")
+ private String zdrq;
+
+ @ApiModelProperty(value = "划线类型(板材)")
+ private String ylzd1;
+
+ @ApiModelProperty(value = "船号")
+ private String dcCh;
+
+ @ApiModelProperty(value = "批量")
+ private String dcPl;
+
+ @ApiModelProperty(value = "组立")
+ private String dcZl;
+
+ @ApiModelProperty(value = "余料")
+ private String sfyl;
+
+ @ApiModelProperty(value = "余料规格(板材)")
+ private String ylgg;
+ @ApiModelProperty(value = "余料规格s(板材)")
+ private String ylggs;
+
+ @ApiModelProperty(value = "数量")
+ private BigDecimal sl;
+
+ @ApiModelProperty(value = "余料数量")
+ private Double ylsl;
+
+ @ApiModelProperty(value = "型材名称(型材)")
+ private String xcmc;
+
+ @ApiModelProperty(value = "型材长度(型材)")
+ private BigDecimal xccd;
+
+ @ApiModelProperty(value = "余料长度(型材)")
+ private BigDecimal ylcd;
+
+ @ApiModelProperty(value = "加工跨")
+ @TableField("ZZCJ")
+ private String zzcj;
+
+ @ApiModelProperty(value = "导入人员")
+ private String drry;
+
+ @ApiModelProperty(value = "导入日期")
+ private String drrq;
+
+ @ApiModelProperty(value = "导入次数")
+ private Integer drcs;
+
+ private String bgr;
+
+ @TableId(value = "hxbh", type = IdType.ASSIGN_UUID)
+ private String hxbh;
+
+ private Double ylzd6;
+
+ private String rkph;
+
+ private String kwh;
+
+ private Double ylzd4;
+
+ private Double xh;
+
+ private Double ylzd5;
+
+ private String rkbs;
+
+ private String ylzd2;
+
+ private String rkrq;
+
+ private String jldw;
+
+ private String ylzd3;
+
+ private Double ylzl;
+
+ private String drbs;
+
+
+}
diff --git a/src/main/java/com/dsic/gj_erp/bean/jcsj/DmBclqjbp.java b/src/main/java/com/dsic/gj_erp/bean/jcsj/DmBclqjbp.java
new file mode 100644
index 0000000..e9be159
--- /dev/null
+++ b/src/main/java/com/dsic/gj_erp/bean/jcsj/DmBclqjbp.java
@@ -0,0 +1,138 @@
+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 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-15
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("DM_BCLQJBP")
+@ApiModel(value="DmBclqjbp对象", description="")
+public class DmBclqjbp implements Serializable {
+
+ private static final long serialVersionUID=1L;
+
+ @ApiModelProperty(value = "组立")
+ @TableField("DC_ZL")
+ private String dcZl;
+
+ @ApiModelProperty(value = "船号")
+ @TableField("DC_CH")
+ private String dcCh;
+
+ @ApiModelProperty(value = "船名")
+ @TableField("DC_CM")
+ private String dcCm;
+
+ @ApiModelProperty(value = "批量")
+ @TableField("DC_FD")
+ private String dcFd;
+
+ @ApiModelProperty(value = "定额类型")
+ @TableField("DELX")
+ private String delx;
+
+ @ApiModelProperty(value = "组立")
+ @TableField("XMBH")
+ private String xmbh;
+
+ @ApiModelProperty(value = "组立")
+ @TableField("YBZS")
+ private BigDecimal ybzs;
+
+ @ApiModelProperty(value = "计算米数")
+ private BigDecimal jsms;
+
+ @ApiModelProperty(value = "实耗米数")
+ private BigDecimal shms;
+
+ @TableField("SHZL")
+ private BigDecimal shzl;
+
+ @TableField("XL")
+ private BigDecimal xl;
+
+ @TableField("DC_PL")
+ private String dcPl;
+
+ @TableField("ZDRQ")
+ private String zdrq;
+
+ @TableField("ZXDW")
+ private String zxdw;
+
+ @TableField("YLZD6")
+ private BigDecimal ylzd6;
+
+ @TableField("LQMJ")
+ private BigDecimal lqmj;
+
+ @TableField("YLZD3")
+ private String ylzd3;
+
+ @TableField("LJZL")
+ private BigDecimal ljzl;
+
+ @TableField("YLZL")
+ private BigDecimal ylzl;
+
+ @TableField("DERQ")
+ private String derq;
+
+ @TableField("YLZD4")
+ private BigDecimal ylzd4;
+
+ @TableField("ZZCJ")
+ private String zzcj;
+
+ @TableField("TZBH")
+ private String tzbh;
+
+ @TableField("YLZD1")
+ private String ylzd1;
+
+ @TableId(value = "LQBH", type = IdType.ASSIGN_UUID)
+ private String lqbh;
+
+ @TableField("BZ")
+ private String bz;
+
+ @TableField("LQZL")
+ private BigDecimal lqzl;
+
+ @TableField("YLZD2")
+ private String ylzd2;
+
+ @TableField("LQLB")
+ private String lqlb;
+
+ @TableField("ZDR")
+ private String zdr;
+
+ @TableField("QPYLD")
+ private BigDecimal qpyld;
+
+ @TableField("YLZD5")
+ private BigDecimal ylzd5;
+
+ @TableField("CJDQ")
+ private BigDecimal cjdq;
+
+
+}
diff --git a/src/main/java/com/dsic/gj_erp/bean/jcsj/DmBclqmxp.java b/src/main/java/com/dsic/gj_erp/bean/jcsj/DmBclqmxp.java
new file mode 100644
index 0000000..6aa7942
--- /dev/null
+++ b/src/main/java/com/dsic/gj_erp/bean/jcsj/DmBclqmxp.java
@@ -0,0 +1,228 @@
+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 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-15
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("DM_BCLQMXP")
+@ApiModel(value="DmBclqmxp对象", description="")
+public class DmBclqmxp implements Serializable {
+
+ private static final long serialVersionUID=1L;
+
+ @ApiModelProperty(value = "序号")
+ @TableId(value = "XH", type = IdType.ASSIGN_UUID)
+ private BigDecimal xh;
+
+ @ApiModelProperty(value = "物品号(规格型材)")
+ @TableField("WPH")
+ private String wph;
+
+ @ApiModelProperty(value = "材质(板材)")
+ @TableField("WPXH")
+ private String wpxh;
+
+ @ApiModelProperty(value = "材质/规格(板材)")
+ @TableField("WPGG")
+ private String wpgg;
+
+ @ApiModelProperty(value = "根数/板数(板材)")
+ @TableField("SL")
+ private BigDecimal sl;
+
+ @ApiModelProperty(value = "领取重量")
+ @TableField("LQZL")
+ private BigDecimal lqzl;
+
+ @ApiModelProperty(value = "实耗重量")
+ @TableField("SHZL")
+ private BigDecimal shzl;
+
+ @ApiModelProperty(value = "余料重量")
+ @TableField("YLZL")
+ private BigDecimal ylzl;
+
+ @ApiModelProperty(value = "前批余料代")
+ @TableField("QPYLD")
+ private BigDecimal qpyld;
+
+ @ApiModelProperty(value = "长度(型材)")
+ @TableField("YLZD11")
+ private BigDecimal ylzd11;
+
+ @ApiModelProperty(value = "领取米数(型材)")
+ private BigDecimal lqms;
+
+ @ApiModelProperty(value = "实耗米数(型材)")
+ private BigDecimal shms;
+
+ @ApiModelProperty(value = "名称(型材)")
+ @TableField("WPMC")
+ private String wpmc;
+
+ @ApiModelProperty(value = "零件套料重量(板材)")
+ @TableField("LJZL")
+ private BigDecimal ljzl;
+
+ @ApiModelProperty(value = "最近切割日期(板材)")
+ private String qgrq;
+
+ @ApiModelProperty(value = "切割数量(板材)")
+ private BigDecimal qgsl;
+
+ @ApiModelProperty(value = "领取类别")
+ @TableField("LQLB_z")
+ private String lqlbZ;
+
+ @ApiModelProperty(value = "批量")
+ @TableField("DC_PL_z")
+ private String dcPlZ;
+
+ @ApiModelProperty(value = "组立")
+ @TableField("DC_ZL_z")
+ private String dcZlZ;
+
+ @ApiModelProperty(value = "船号")
+ @TableField("DC_CH_z")
+ private String dcChZ;
+
+ @ApiModelProperty(value = "船名")
+ @TableField("DC_CM_z")
+ private String dcCmZ;
+
+ @ApiModelProperty(value = "分段")
+ @TableField("DC_FD_z")
+ private String dcFdZ;
+
+ @ApiModelProperty(value = "定额类型")
+ @TableField("DELX_z")
+ private String delxZ;
+
+ @ApiModelProperty(value = "导入日期")
+ @TableField("DERQ_z")
+ private String derqZ;
+
+ @ApiModelProperty(value = "项目编号")
+ @TableField("XMBH_z")
+ private String xmbhZ;
+
+ @ApiModelProperty(value = "用板总数")
+ @TableField("YBZS_z")
+ private BigDecimal ybzsZ;
+
+ @ApiModelProperty(value = "领取重量(总)")
+ @TableField("LQZL_z")
+ private BigDecimal lqzlZ;
+
+ @ApiModelProperty(value = "实耗重量(总)")
+ @TableField("SHZL_z")
+ private BigDecimal shzlZ;
+
+ @ApiModelProperty(value = "余料重量(总)")
+ @TableField("YLZL_z")
+ private BigDecimal ylzlZ;
+
+ @ApiModelProperty(value = "前批余料代(总)")
+ @TableField("QPYLD_z")
+ private BigDecimal qpyldZ;
+
+ @ApiModelProperty(value = "执行单位")
+ @TableField("ZXDW_z")
+ private String zxdwZ;
+
+ @ApiModelProperty(value = "领取面积")
+ @TableField("LQMJ_z")
+ private BigDecimal lqmjZ;
+
+ @ApiModelProperty(value = "车间底漆")
+ @TableField("CJDQ_z")
+ private BigDecimal cjdqZ;
+
+ @ApiModelProperty(value = "稀料")
+ @TableField("XL_z")
+ private BigDecimal xlZ;
+
+ @ApiModelProperty(value = "制单人")
+ @TableField("ZDR_z")
+ private String zdrZ;
+
+ @ApiModelProperty(value = "制单日期")
+ @TableField("ZDRQ_z")
+ private String zdrqZ;
+
+ @ApiModelProperty(value = "计算米数")
+ @TableField("JSMS_z")
+ private BigDecimal jsmsZ;
+
+ @ApiModelProperty(value = "实耗米数(总)")
+ @TableField("SHMS_z")
+ private BigDecimal shmsZ;
+
+ @ApiModelProperty(value = "零件套料重量")
+ @TableField("LJZL_z")
+ private BigDecimal ljzlZ;
+
+ @ApiModelProperty(value = "加工跨")
+ @TableField("ZZCJ_z")
+ private String zzcjZ;
+
+ @ApiModelProperty(value = "导入次数")
+ private Integer drcs;
+
+ @TableField("YLZD12")
+ private BigDecimal ylzd12;
+
+ @TableField("XGRQ")
+ private String xgrq;
+
+ @TableField("BZ_z")
+ private String bzZ;
+
+ @TableField("YLZD9")
+ private String ylzd9;
+
+ @TableField("YLZD10")
+ private BigDecimal ylzd10;
+
+ @TableField("BZ")
+ private String bz;
+
+ @TableField("YLZD7")
+ private String ylzd7;
+
+ @TableField("XGR")
+ private String xgr;
+
+ @TableField("YLZD8")
+ private String ylzd8;
+
+ private BigDecimal sysl;
+
+ @TableField("LQBH")
+ private String lqbh;
+
+ @TableField(exist = false)
+ private BigDecimal dztlzl;
+ @TableField(exist = false)
+ private BigDecimal tlshbl;
+
+
+}
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
new file mode 100644
index 0000000..b055796
--- /dev/null
+++ b/src/main/java/com/dsic/gj_erp/bean/jcsj/DmBom.java
@@ -0,0 +1,194 @@
+package com.dsic.gj_erp.bean.jcsj;
+
+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 xn
+ * @since 2023-09-25
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="DmBom对象", description="")
+public class DmBom implements Serializable {
+
+ private static final long serialVersionUID=1L;
+
+ @ApiModelProperty(value = "船号")
+ private String dcch;
+
+ @ApiModelProperty(value = "目标船号")
+ private String mbch;
+
+ @ApiModelProperty(value = "数据船号")
+ private String sjch;
+
+ @ApiModelProperty(value = "批量")
+ private String pl;
+
+ @ApiModelProperty(value = "分段")
+ private String fd;
+
+ @ApiModelProperty(value = "需求地点")
+ private String xqdd;
+
+ @ApiModelProperty(value = "抛丸")
+ private String pw;
+
+ @ApiModelProperty(value = "领取类别")
+ private String lqlb;
+
+ @ApiModelProperty(value = "跨位")
+ private String kw;
+
+ @ApiModelProperty(value = "设备编号")
+ private String sbbh;
+
+ @ApiModelProperty(value = "设备类型")
+ private String sclx;
+
+ @ApiModelProperty(value = "组立")
+ private String zl;
+
+ @ApiModelProperty(value = "物品材质")
+ private String wpcz;
+
+ @ApiModelProperty(value = "物品规格")
+ private String wpgg;
+
+ @ApiModelProperty(value = "板厚")
+ private BigDecimal bh;
+
+ @ApiModelProperty(value = "版长")
+ private BigDecimal bc;
+
+ @ApiModelProperty(value = "油漆用量")
+ private Double yqyl;
+
+ @ApiModelProperty(value = "切割长度")
+ private BigDecimal qgcd;
+ @ApiModelProperty(value = "划线长度")
+ private BigDecimal hxcd;
+
+ @ApiModelProperty(value = "图纸编号")
+ private String tzbh;
+
+ @ApiModelProperty(value = "套料数量")
+ private BigDecimal tlsl;
+
+ @ApiModelProperty(value = "坡口类型")
+ private String pklx;
+
+ @ApiModelProperty(value = "曲标识")
+ private String qbs;
+
+ @ApiModelProperty(value = "坡口長度")
+ private String pkbs;
+
+ @ApiModelProperty(value = "坡口标识")
+ private Double pkcd;
+
+ @ApiModelProperty(value = "打磨标识")
+ private String dmbs;
+
+ @ApiModelProperty(value = "打磨长度")
+ private Double dmcd;
+
+ @ApiModelProperty(value = "装配顺序")
+ private Integer zpsx;
+
+ @ApiModelProperty(value = "零件编号")
+ private String ljbh;
+
+ @ApiModelProperty(value = "零件数量")
+ private BigDecimal ljsl;
+
+ @ApiModelProperty(value = "零件属性")
+ private String ljsx;
+
+ @ApiModelProperty(value = "单件面积")
+ private Double djmj;
+
+ @ApiModelProperty(value = "零件单重")
+ private Double ljdz;
+
+ @ApiModelProperty(value = "备料")
+ private Double blgs;
+
+ @ApiModelProperty(value = "抛丸")
+ private Double pwgs;
+
+ @ApiModelProperty(value = "理料")
+ private Double llgs;
+
+ @ApiModelProperty(value = "划线")
+ private Double hxgs;
+
+ @ApiModelProperty(value = "切割")
+ private Double qggs;
+
+ @ApiModelProperty(value = "坡口")
+ private Double pkgs;
+
+ @ApiModelProperty(value = "曲")
+ private Double qgs;
+
+ @ApiModelProperty(value = "打磨")
+ private Double dmgs;
+
+ @ApiModelProperty(value = "装配")
+ private Double zpgs;
+
+ @ApiModelProperty(value = "反馈备料")
+ private Double fkblgs;
+
+ @ApiModelProperty(value = "抛丸")
+ private Double fkpwgs;
+
+ @ApiModelProperty(value = "理料")
+ private Double fkllgs;
+
+ @ApiModelProperty(value = "划线")
+ private Double fkhxgs;
+
+ @ApiModelProperty(value = "切割")
+ private Double fkqggs;
+
+ @ApiModelProperty(value = "坡口")
+ private Double fkpkgs;
+
+ @ApiModelProperty(value = "曲")
+ private Double fkqgs;
+
+ @ApiModelProperty(value = "打磨")
+ private Double fkdmgs;
+
+ @ApiModelProperty(value = "装配")
+ private Double fkzpgs;
+
+ private Integer pid;
+
+ private String type;
+
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+
+ private String fds;
+
+ private String lqbs;
+
+ private String tjbs;
+
+
+}
diff --git a/src/main/java/com/dsic/gj_erp/bean/jcsj/DmCbxxp.java b/src/main/java/com/dsic/gj_erp/bean/jcsj/DmCbxxp.java
index 2764610..795c288 100644
--- a/src/main/java/com/dsic/gj_erp/bean/jcsj/DmCbxxp.java
+++ b/src/main/java/com/dsic/gj_erp/bean/jcsj/DmCbxxp.java
@@ -1,10 +1,9 @@
package com.dsic.gj_erp.bean.jcsj;
-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.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -12,6 +11,8 @@ import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.Setter;
+import java.io.Serializable;
+
/**
*
*
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 9492d96..1e49a44 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,17 +1,17 @@
package com.dsic.gj_erp.bean.jcsj;
-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 java.math.BigDecimal;
-
+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;
import lombok.EqualsAndHashCode;
+import java.io.Serializable;
+import java.math.BigDecimal;
+
/**
*
*
@@ -28,7 +28,7 @@ public class DmCzplp implements Serializable {
private static final long serialVersionUID=1L;
- @ApiModelProperty(value = "船号")
+ @ApiModelProperty(value = "1111")
@TableField("DC_CH")
private String dcCh;
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 990f0d2..5c33927 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
@@ -1,16 +1,16 @@
package com.dsic.gj_erp.bean.jcsj;
import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableField;
-import java.io.Serializable;
-import java.math.BigDecimal;
-
+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;
+
/**
*
*
diff --git a/src/main/java/com/dsic/gj_erp/bean/jcsj/DmWlqd.java b/src/main/java/com/dsic/gj_erp/bean/jcsj/DmWlqd.java
new file mode 100644
index 0000000..5b55ba4
--- /dev/null
+++ b/src/main/java/com/dsic/gj_erp/bean/jcsj/DmWlqd.java
@@ -0,0 +1,243 @@
+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 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-21
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("DM_WLQD")
+@ApiModel(value="DmWlqd对象", description="")
+public class DmWlqd implements Serializable {
+
+ private static final long serialVersionUID=1L;
+
+ @ApiModelProperty(value = "物品级别")
+ @TableField("WPJB")
+ private String wpjb;
+
+ @ApiModelProperty(value = "物品分类")
+ @TableField("WPFLM")
+ private String wpflm;
+
+ @ApiModelProperty(value = "编制人")
+ @TableField("ZDRY")
+ private String zdry;
+
+ @ApiModelProperty(value = "编制日期")
+ @TableField("XGRQ")
+ private String xgrq;
+
+ @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;
+
+ @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("JLDW1")
+ private String jldw1;
+
+ @ApiModelProperty(value = "物品名称")
+ @TableField("WPMC")
+ private String wpmc;
+
+ @ApiModelProperty(value = "规格")
+ @TableField("WPGG")
+ private String wpgg;
+
+ @ApiModelProperty(value = "材质")
+ @TableField("WPXH")
+ private String wpxh;
+
+ @ApiModelProperty(value = "ABC分类")
+ @TableField("ABCLX")
+ private String abclx;
+
+ @ApiModelProperty(value = "加工进度")
+ @TableField("GZLX")
+ private String gzlx;
+
+ @ApiModelProperty(value = "配套表类型")
+ @TableField("YLZD1")
+ private String ylzd1;
+
+ @ApiModelProperty(value = "流程码")
+ @TableField("LCM1")
+ private String lcm1;
+
+ @ApiModelProperty(value = "状态")
+ private String zt;
+
+ @TableField("YLZD2")
+ private String ylzd2;
+
+ @TableField("YLZD8")
+ private String ylzd8;
+
+ @TableField("DEZL")
+ private BigDecimal dezl;
+
+ @TableField("LCM5")
+ private String lcm5;
+
+ @TableField("XNJBS")
+ private String xnjbs;
+
+ @TableField("SL")
+ private BigDecimal sl;
+
+ @TableField("YLZD5")
+ private Double ylzd5;
+
+ @TableField("YXZZRQ")
+ private Double yxzzrq;
+
+ @TableField("LCM2")
+ private String lcm2;
+
+ @TableField("JLDW")
+ private String jldw;
+
+ @TableField("YLZD6")
+ private Double ylzd6;
+
+ @TableField("GYSBH")
+ private String gysbh;
+
+ @TableField("TQQXZL")
+ private Double tqqxzl;
+
+ @TableField("YLZD3")
+ private String ylzd3;
+
+ @TableId(value = "XWH", type = IdType.ASSIGN_UUID)
+ private Double xwh;
+
+ @TableField("BZ")
+ private String bz;
+
+ @TableField("YLZD9")
+ private String ylzd9;
+
+ @TableField("YLZD4")
+ private Double ylzd4;
+
+ @TableField("ZXWPH")
+ private String zxwph;
+
+ @TableField("GYLB")
+ private String gylb;
+
+ @TableField("YXQSRQ")
+ private Double yxqsrq;
+
+ @TableField("DRRY")
+ private String drry;
+
+ @TableField("LCM3")
+ private String lcm3;
+
+ @TableField("YHFLH")
+ private String yhflh;
+
+ @TableField("WPH")
+ private String wph;
+
+ @TableField("XLCC")
+ private String xlcc;
+
+ @TableField("FXWPH")
+ private String fxwph;
+
+ @TableField("WPCC")
+ private String wpcc;
+
+ @TableField("JZL")
+ private Double jzl;
+
+ @TableField("FWPJB")
+ private String fwpjb;
+
+ @TableField("YLZD7")
+ private String ylzd7;
+
+ @TableField("SJBCSL")
+ private Double sjbcsl;
+
+ @TableField("DRRQ")
+ private String drrq;
+
+ @TableField("LCM4")
+ private String lcm4;
+
+ private int drcs;
+
+
+ @TableField(exist = false)
+ private String tzbh;
+
+
+}
diff --git a/src/main/java/com/dsic/gj_erp/bean/jcsj/DmWpjbp.java b/src/main/java/com/dsic/gj_erp/bean/jcsj/DmWpjbp.java
new file mode 100644
index 0000000..89ab7b4
--- /dev/null
+++ b/src/main/java/com/dsic/gj_erp/bean/jcsj/DmWpjbp.java
@@ -0,0 +1,494 @@
+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 io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+
+/**
+ *
+ *
+ *
+ *
+ * @author xn
+ * @since 2023-09-21
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("DM_WPJBP")
+@ApiModel(value="DmWpjbp对象", description="")
+public class DmWpjbp implements Serializable {
+
+ private static final long serialVersionUID=1L;
+
+ @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;
+
+ @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;
+
+ @TableField("ZJBS")
+ private String zjbs;
+
+ @TableField("WPZS")
+ private String wpzs;
+
+ @TableField("CPLL_JLDW")
+ private String cpllJldw;
+
+ @TableField("YHFLH")
+ private String yhflh;
+
+ @TableId(value = "WPH", type = IdType.ASSIGN_UUID)
+ private String wph;
+
+ @TableField("YXQSSJ")
+ private String yxqssj;
+
+ @TableField("KJKMBM")
+ private String kjkmbm;
+
+ @TableField("JSTJ")
+ private String jstj;
+
+ @TableField("DJGL")
+ private Double djgl;
+
+ @TableField("XGSJCG")
+ private String xgsjcg;
+
+ @TableField("DJDY_JLDW")
+ private String djdyJldw;
+
+ @TableField("BPL")
+ private Double bpl;
+
+ @TableField("GJJBS")
+ private String gjjbs;
+
+ @TableField("WPFLM4")
+ private String wpflm4;
+
+ @TableField("WPXH")
+ private String wpxh;
+
+ @TableField("ZTF")
+ private Double ztf;
+
+ @TableField("GYCZY")
+ private String gyczy;
+
+ @TableField("BSLX")
+ private String bslx;
+
+ @TableField("JLDW1")
+ private String jldw1;
+
+ @TableField("PLJS")
+ private Integer pljs;
+
+ @TableField("BZJGXGR")
+ private String bzjgxgr;
+
+ @TableField("FPXS")
+ private Double fpxs;
+
+ @TableField("WPJSTJ")
+ private String wpjstj;
+
+ @TableField("CPCS")
+ private Double cpcs;
+
+ @TableField("ZDRYQL")
+ private String zdryql;
+
+ @TableField("ZGZQ")
+ private Double zgzq;
+
+ @TableField("ZDPL")
+ private Double zdpl;
+
+ @TableField("ZL")
+ private Double zl;
+
+ @TableField("ZXBZH")
+ private String zxbzh;
+
+ @TableField("JLCD")
+ private Double jlcd;
+
+ @TableField("JGCZY")
+ private String jgczy;
+
+ @TableField("YLZD2")
+ private String ylzd2;
+
+ @TableField("CCXGR")
+ private String ccxgr;
+
+ @TableField("XGSJ")
+ private String xgsj;
+
+ @TableField("CGJLDW")
+ private String cgjldw;
+
+ @TableField("DEZL")
+ private Double dezl;
+
+ @TableField("BZJGXGRQ")
+ private String bzjgxgrq;
+
+ @TableField("DWHSL")
+ private Double dwhsl;
+
+ @TableField("FJBS")
+ private String fjbs;
+
+ @TableField("XGSJQL")
+ private String xgsjql;
+
+ @TableField("FDGZQ")
+ private Double fdgzq;
+
+ @TableField("ZDRYTQ")
+ private String zdrytq;
+
+ @TableField("YLZD5")
+ private Double ylzd5;
+
+ @TableField("JYC")
+ private Double jyc;
+
+ @TableField("WPFLM2")
+ private String wpflm2;
+
+ @TableField("ZLBZH")
+ private String zlbzh;
+
+ @TableField("WPFLM")
+ private String wpflm;
+
+ @TableField("TQQXGBS")
+ private String tqqxgbs;
+
+ @TableField("GYWCBS")
+ private String gywcbs;
+
+ @TableField("XNJBS")
+ private String xnjbs;
+
+ @TableField("DHKC")
+ private Double dhkc;
+
+ @TableField("WPFLM5")
+ private String wpflm5;
+
+ @TableField("DWJGXGR")
+ private String dwjgxgr;
+
+ @TableField("SPBM")
+ private String spbm;
+
+ @TableField("DFKMBM")
+ private String dfkmbm;
+
+ @TableField("YXZZSJ")
+ private String yxzzsj;
+
+ @TableField("CPTY")
+ private Double cpty;
+
+ @TableField("JZMD")
+ private Double jzmd;
+
+ @TableField("GSDEM")
+ private String gsdem;
+
+ @TableField("YXYC")
+ private Double yxyc;
+
+ @TableField("BZJG")
+ private Double bzjg;
+
+ @TableField("RKBS")
+ private String rkbs;
+
+ @TableField("ZXPL")
+ private Double zxpl;
+
+ @TableField("JGBZ")
+ private String jgbz;
+
+ @TableField("JGWCBS")
+ private String jgwcbs;
+
+ @TableField("YLZD8")
+ private String ylzd8;
+
+ @TableField("ABCLX")
+ private String abclx;
+
+ @TableField("DRJG")
+ private Double drjg;
+
+ @TableField("ZDRY")
+ private String zdry;
+
+ @TableField("FGSJ")
+ private Double fgsj;
+
+ @TableField("GZLX")
+ private String gzlx;
+
+ @TableField("AQDM")
+ private String aqdm;
+
+ @TableField("DWJGXGRQ")
+ private String dwjgxgrq;
+
+ @TableField("CGBZ")
+ private String cgbz;
+
+ @TableField("WPTPDZ")
+ private String wptpdz;
+
+ @TableField("CPCS_JLDW")
+ private String cpcsJldw;
+
+ @TableField("ZJM")
+ private String zjm;
+
+ @TableField("BSBM")
+ private String bsbm;
+
+ @TableField("BZ")
+ private String bz;
+
+ @TableField("XHZL")
+ private Double xhzl;
+
+ @TableField("WPMC")
+ private String wpmc;
+
+ @TableField("CCXGRQ")
+ private String ccxgrq;
+
+ @TableField("YLZD3")
+ private String ylzd3;
+
+ @TableField("YLZD9")
+ private String ylzd9;
+
+ @TableField("CKH")
+ private String ckh;
+
+ @TableField("YLL")
+ private Double yll;
+
+ @TableField("XJBS")
+ private String xjbs;
+
+ @TableField("DBZ")
+ private String dbz;
+
+ @TableField("WPGL")
+ private String wpgl;
+
+ @TableField("AQKC")
+ private Double aqkc;
+
+ @TableField("GYLX")
+ private String gylx;
+
+ @TableField("GYLB")
+ private String gylb;
+
+ @TableField("BZPL")
+ private Double bzpl;
+
+ @TableField("WPCC")
+ private String wpcc;
+
+ @TableField("DJGL_JLDW")
+ private String djglJldw;
+
+ @TableField("JZ")
+ private String jz;
+
+ @TableField("PLDM")
+ private String pldm;
+
+ @TableField("DWJG")
+ private Double dwjg;
+
+ @TableField("WPFLM3")
+ private String wpflm3;
+
+ @TableField("WPGG")
+ private String wpgg;
+
+ @TableField("GYCZRQ")
+ private String gyczrq;
+
+ @TableField("YLZD6")
+ private Double ylzd6;
+
+ @TableField("ZZBM")
+ private String zzbm;
+
+ @TableField("ZDKC")
+ private Double zdkc;
+
+ @TableField("DCM")
+ private Double dcm;
+
+ @TableField("WPEMC")
+ private String wpemc;
+
+ @TableField("GYSBH")
+ private String gysbh;
+
+ @TableField("PHXS")
+ private Double phxs;
+
+ @TableField("WPZL")
+ private Double wpzl;
+
+ @TableField("CPTY_JLDW")
+ private String cptyJldw;
+
+ @TableField("WD")
+ private Double wd;
+
+ @TableField("DJDY")
+ private Double djdy;
+
+ @TableField("JGCZRQ")
+ private String jgczrq;
+
+ @TableField("YCZJL")
+ private Double yczjl;
+
+ @TableField("JGWCRQ")
+ private String jgwcrq;
+
+ @TableField("CFLAG")
+ private String cflag;
+
+ @TableField("CLDH")
+ private String cldh;
+
+ @TableField("YLZD1")
+ private String ylzd1;
+
+ @TableField("YLZD7")
+ private String ylzd7;
+
+ @TableField("ZDSJ")
+ private String zdsj;
+
+ @TableField("GDPL")
+ private Double gdpl;
+
+ @TableField("TZGG")
+ private String tzgg;
+
+ @TableField("CPLL")
+ private Double cpll;
+
+ @TableField("CCBS")
+ private String ccbs;
+
+ @TableField("AQQ")
+ private Double aqq;
+
+ @TableField("JYBZ")
+ private String jybz;
+
+ @TableField("BZXX")
+ private String bzxx;
+
+ @TableField("KCJBS")
+ private String kcjbs;
+
+ @TableField("CPXL")
+ private Double cpxl;
+
+ @TableField("ZDRYCG")
+ private String zdrycg;
+
+ @TableField("XGSJTQ")
+ private String xgsjtq;
+
+ @TableField("XSJG")
+ private Double xsjg;
+
+ @TableField("JLDW")
+ private String jldw;
+
+ @TableField("WPJB")
+ private String wpjb;
+
+ @TableField("GYWCRQ")
+ private String gywcrq;
+
+ @TableField("ZTQQXGBS")
+ private String ztqqxgbs;
+
+ @TableField("YLZD4")
+ private Double ylzd4;
+
+
+}
diff --git a/src/main/java/com/dsic/gj_erp/bean/jcsj/excel/PlExcel.java b/src/main/java/com/dsic/gj_erp/bean/jcsj/excel/PlExcel.java
index 55f6de0..de27dfe 100644
--- a/src/main/java/com/dsic/gj_erp/bean/jcsj/excel/PlExcel.java
+++ b/src/main/java/com/dsic/gj_erp/bean/jcsj/excel/PlExcel.java
@@ -2,10 +2,6 @@ package com.dsic.gj_erp.bean.jcsj.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 com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
diff --git a/src/main/java/com/dsic/gj_erp/controller/jcsj/BomUploadController.java b/src/main/java/com/dsic/gj_erp/controller/jcsj/BomUploadController.java
new file mode 100644
index 0000000..febbfe0
--- /dev/null
+++ b/src/main/java/com/dsic/gj_erp/controller/jcsj/BomUploadController.java
@@ -0,0 +1,40 @@
+package com.dsic.gj_erp.controller.jcsj;
+
+import com.dsic.gj_erp.annotation.AuthFunction;
+import com.dsic.gj_erp.bean.ResultBean;
+import com.dsic.gj_erp.exception.CustomException;
+import com.dsic.gj_erp.service.jcsj.impl.BomUploadServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ *
+ * 前端控制器
+ *
+ *
+ * @author xn
+ * @since 2023-09-11
+ */
+@RestController
+@RequestMapping("/bom")
+public class BomUploadController {
+ @Autowired
+ BomUploadServiceImpl bomUploadService;
+
+
+ @PostMapping("/uploadBom")
+ @AuthFunction
+ @ResponseBody
+ public ResultBean uploadPl(@RequestParam("file") MultipartFile[] file , String czbh, String isupload, HttpServletRequest req) throws Exception, CustomException {
+ return bomUploadService.uploadZ( file , czbh, isupload, req);
+
+
+ }
+
+
+
+}
+
diff --git a/src/main/java/com/dsic/gj_erp/controller/jcsj/DmBchxjbpController.java b/src/main/java/com/dsic/gj_erp/controller/jcsj/DmBchxjbpController.java
new file mode 100644
index 0000000..72677f6
--- /dev/null
+++ b/src/main/java/com/dsic/gj_erp/controller/jcsj/DmBchxjbpController.java
@@ -0,0 +1,19 @@
+package com.dsic.gj_erp.controller.jcsj;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ *
+ * 前端控制器
+ *
+ *
+ * @author xn
+ * @since 2023-09-20
+ */
+@RestController
+@RequestMapping("/dmBchxjbp")
+public class DmBchxjbpController {
+
+}
+
diff --git a/src/main/java/com/dsic/gj_erp/controller/jcsj/DmBchxmxpController.java b/src/main/java/com/dsic/gj_erp/controller/jcsj/DmBchxmxpController.java
new file mode 100644
index 0000000..fa925c0
--- /dev/null
+++ b/src/main/java/com/dsic/gj_erp/controller/jcsj/DmBchxmxpController.java
@@ -0,0 +1,37 @@
+package com.dsic.gj_erp.controller.jcsj;
+
+import com.dsic.gj_erp.bean.ResultBean;
+import com.dsic.gj_erp.bean.jcsj.DmBchxmxp;
+import com.dsic.gj_erp.exception.CustomException;
+import com.dsic.gj_erp.service.jcsj.DmBchxmxpService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+import java.util.Map;
+
+/**
+ *
+ * 前端控制器 套料图
+ *
+ *
+ * @author xn
+ * @since 2023-09-20
+ */
+@RestController
+@RequestMapping("/dmBchxmxp")
+public class DmBchxmxpController {
+
+ @Autowired
+ DmBchxmxpService dmBchxmxpService;
+
+ @PostMapping("/getTLTList")
+ @ResponseBody
+ public ResultBean getBcTJlList(HttpServletRequest req, @RequestBody Map map) throws Exception, CustomException {
+ List getTLTList = dmBchxmxpService.getTLTList(map);
+ return new ResultBean(getTLTList);
+
+ }
+}
+
diff --git a/src/main/java/com/dsic/gj_erp/controller/jcsj/DmBchxylpController.java b/src/main/java/com/dsic/gj_erp/controller/jcsj/DmBchxylpController.java
new file mode 100644
index 0000000..6b6753e
--- /dev/null
+++ b/src/main/java/com/dsic/gj_erp/controller/jcsj/DmBchxylpController.java
@@ -0,0 +1,35 @@
+package com.dsic.gj_erp.controller.jcsj;
+
+import com.dsic.gj_erp.bean.ResultBean;
+import com.dsic.gj_erp.bean.jcsj.DmBchxylp;
+import com.dsic.gj_erp.exception.CustomException;
+import com.dsic.gj_erp.service.jcsj.DmBchxylpService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+import java.util.Map;
+
+/**
+ *
+ * 前端控制器
+ *
+ *
+ * @author xn
+ * @since 2023-09-19
+ */
+@RestController
+@RequestMapping("/dmBchxylp")
+public class DmBchxylpController {
+ @Autowired
+ DmBchxylpService dmBchxylpService;
+ @PostMapping("/getBcTJlList")
+ @ResponseBody
+ public ResultBean getBcTJlList(HttpServletRequest req, @RequestBody Map map) throws Exception, CustomException {
+ List bcLQlList = dmBchxylpService.getBcTJlList(map);
+ return new ResultBean(bcLQlList);
+
+ }
+}
+
diff --git a/src/main/java/com/dsic/gj_erp/controller/jcsj/DmBclqjbpController.java b/src/main/java/com/dsic/gj_erp/controller/jcsj/DmBclqjbpController.java
new file mode 100644
index 0000000..45d220b
--- /dev/null
+++ b/src/main/java/com/dsic/gj_erp/controller/jcsj/DmBclqjbpController.java
@@ -0,0 +1,19 @@
+package com.dsic.gj_erp.controller.jcsj;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ *
+ * 前端控制器
+ *
+ *
+ * @author xn
+ * @since 2023-09-15
+ */
+@RestController
+@RequestMapping("/dmBclqjbp")
+public class DmBclqjbpController {
+
+}
+
diff --git a/src/main/java/com/dsic/gj_erp/controller/jcsj/DmBclqmxpController.java b/src/main/java/com/dsic/gj_erp/controller/jcsj/DmBclqmxpController.java
new file mode 100644
index 0000000..50e0115
--- /dev/null
+++ b/src/main/java/com/dsic/gj_erp/controller/jcsj/DmBclqmxpController.java
@@ -0,0 +1,38 @@
+package com.dsic.gj_erp.controller.jcsj;
+
+
+import com.dsic.gj_erp.bean.ResultBean;
+import com.dsic.gj_erp.bean.jcsj.DmBclqmxp;
+import com.dsic.gj_erp.exception.CustomException;
+import com.dsic.gj_erp.service.jcsj.DmBclqmxpService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+import java.util.Map;
+
+/**
+ *
+ * 前端控制器
+ *
+ *
+ * @author xn
+ * @since 2023-09-15
+ */
+@RestController
+@RequestMapping("/dmBclqmxp")
+public class DmBclqmxpController {
+
+ @Autowired
+ DmBclqmxpService dmBclqmxpService;
+ @PostMapping("/getBcLQlList")
+ @ResponseBody
+ public ResultBean getBcLQlList(HttpServletRequest req, @RequestBody Map map) throws Exception, CustomException {
+ List bcLQlList = dmBclqmxpService.getBcLQlList(map);
+ return new ResultBean(bcLQlList);
+
+ }
+
+}
+
diff --git a/src/main/java/com/dsic/gj_erp/controller/jcsj/DmBomController.java b/src/main/java/com/dsic/gj_erp/controller/jcsj/DmBomController.java
new file mode 100644
index 0000000..670b6c8
--- /dev/null
+++ b/src/main/java/com/dsic/gj_erp/controller/jcsj/DmBomController.java
@@ -0,0 +1,61 @@
+package com.dsic.gj_erp.controller.jcsj;
+
+import com.dsic.gj_erp.annotation.AuthFunction;
+import com.dsic.gj_erp.bean.ResultBean;
+import com.dsic.gj_erp.bean.jcsj.DmBom;
+import com.dsic.gj_erp.exception.CustomException;
+import com.dsic.gj_erp.service.jcsj.DmBomService;
+import com.dsic.gj_erp.service.jcsj.impl.BomUploadServiceImpl;
+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 xn
+ * @since 2023-09-25
+ */
+@RestController
+@RequestMapping("/dmBom")
+public class DmBomController {
+
+ @Autowired
+ DmBomService dmBomService;
+
+ @Autowired
+ BomUploadServiceImpl bomUploadService;
+
+ @PostMapping("/getListBom")
+ public ResultBean getListBom(HttpServletRequest req, @RequestBody Map map) throws CustomException {
+ List listBom = dmBomService.getListBom(map);
+ return new ResultBean(listBom);
+ }
+
+ @PostMapping("/addListBom")
+ @AuthFunction
+ public ResultBean addListBom(HttpServletRequest req, @RequestBody Map map) throws CustomException {
+ List dmBoms = bomUploadService.insertBom(req,(String) map.get("dcch"), (String) map.get("dcpl"));
+// dmBomService.insertBoms(dmBoms);
+ return new ResultBean(dmBoms);
+ }
+
+
+ @PostMapping("/saveListBom")
+ public ResultBean saveListBom(HttpServletRequest req, @RequestBody List list) throws CustomException {
+ dmBomService.insertBoms(list);
+//
+ return new ResultBean();
+// return null;
+ }
+
+}
+
diff --git a/src/main/java/com/dsic/gj_erp/controller/jcsj/DmCbxxpController.java b/src/main/java/com/dsic/gj_erp/controller/jcsj/DmCbxxpController.java
index 978a640..de4f573 100644
--- a/src/main/java/com/dsic/gj_erp/controller/jcsj/DmCbxxpController.java
+++ b/src/main/java/com/dsic/gj_erp/controller/jcsj/DmCbxxpController.java
@@ -1,23 +1,15 @@
package com.dsic.gj_erp.controller.jcsj;
-
-import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
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.service.jcsj.DmCbxxpService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.Authorization;
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 javax.servlet.http.HttpServletRequest;
import java.util.List;
import java.util.Map;
diff --git a/src/main/java/com/dsic/gj_erp/controller/jcsj/DmCzplpController.java b/src/main/java/com/dsic/gj_erp/controller/jcsj/DmCzplpController.java
index 7c3b09e..fb5b9f8 100644
--- a/src/main/java/com/dsic/gj_erp/controller/jcsj/DmCzplpController.java
+++ b/src/main/java/com/dsic/gj_erp/controller/jcsj/DmCzplpController.java
@@ -1,8 +1,6 @@
package com.dsic.gj_erp.controller.jcsj;
-
import org.springframework.web.bind.annotation.RequestMapping;
-
import org.springframework.web.bind.annotation.RestController;
/**
diff --git a/src/main/java/com/dsic/gj_erp/controller/jcsj/DmCzplpNewController.java b/src/main/java/com/dsic/gj_erp/controller/jcsj/DmCzplpNewController.java
index 9333dfe..8a06bb2 100644
--- a/src/main/java/com/dsic/gj_erp/controller/jcsj/DmCzplpNewController.java
+++ b/src/main/java/com/dsic/gj_erp/controller/jcsj/DmCzplpNewController.java
@@ -9,8 +9,6 @@ import com.dsic.gj_erp.bean.jcsj.excel.PlExcel;
import com.dsic.gj_erp.exception.CustomException;
import com.dsic.gj_erp.listeners.ExcelPlListener;
import com.dsic.gj_erp.service.jcsj.DmCzplpNewService;
-import com.dsic.gj_erp.service.jcsj.DmCzplpService;
-import io.swagger.annotations.Authorization;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
diff --git a/src/main/java/com/dsic/gj_erp/controller/jcsj/DmWlqdController.java b/src/main/java/com/dsic/gj_erp/controller/jcsj/DmWlqdController.java
new file mode 100644
index 0000000..193eb23
--- /dev/null
+++ b/src/main/java/com/dsic/gj_erp/controller/jcsj/DmWlqdController.java
@@ -0,0 +1,38 @@
+package com.dsic.gj_erp.controller.jcsj;
+
+import com.dsic.gj_erp.bean.ResultBean;
+import com.dsic.gj_erp.bean.jcsj.DmWlqd;
+import com.dsic.gj_erp.exception.CustomException;
+import com.dsic.gj_erp.service.jcsj.DmWlqdService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+import java.util.Map;
+
+/**
+ *
+ * 前端控制器
+ *
+ *
+ * @author xn
+ * @since 2023-09-21
+ */
+@RestController
+@RequestMapping("/dmWlqd")
+public class DmWlqdController {
+
+ @Autowired
+ DmWlqdService dmWlqdService;
+
+ @PostMapping("/getLJQDList")
+ @ResponseBody
+ public ResultBean getLJQDList(HttpServletRequest req, @RequestBody Map map) throws Exception, CustomException {
+ List getTLTList = dmWlqdService.getLJQDList(map);
+ return new ResultBean(getTLTList);
+
+ }
+
+}
+
diff --git a/src/main/java/com/dsic/gj_erp/controller/jcsj/DmWpjbpController.java b/src/main/java/com/dsic/gj_erp/controller/jcsj/DmWpjbpController.java
new file mode 100644
index 0000000..aaab622
--- /dev/null
+++ b/src/main/java/com/dsic/gj_erp/controller/jcsj/DmWpjbpController.java
@@ -0,0 +1,19 @@
+package com.dsic.gj_erp.controller.jcsj;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ *
+ * 前端控制器
+ *
+ *
+ * @author xn
+ * @since 2023-09-21
+ */
+@RestController
+@RequestMapping("/dmWpjbp")
+public class DmWpjbpController {
+
+}
+
diff --git a/src/main/java/com/dsic/gj_erp/dao/sy/Dm_zhbmpRepository.java b/src/main/java/com/dsic/gj_erp/dao/sy/Dm_zhbmpRepository.java
index 4882b16..b1ba276 100644
--- a/src/main/java/com/dsic/gj_erp/dao/sy/Dm_zhbmpRepository.java
+++ b/src/main/java/com/dsic/gj_erp/dao/sy/Dm_zhbmpRepository.java
@@ -20,7 +20,7 @@ public interface Dm_zhbmpRepository extends JpaRepository findByBMLB(String bmlb);
Dm_zhbmp findByBMLBAndBM(String bmlb,String bm);
-
+ Dm_zhbmp findByBMLBAndBmsm(String bmlb,String bmsm);
@Query(nativeQuery = true,value = "select bm as dwbm,bmsm as dwmc from dm_zhbmp where BMLB='BMBM' and (left(bm,3)='023' ) and isnull(ylzd3,'N')='D'")
List