first

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;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @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;
+
+
+}

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;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @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;
+
+
+}

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;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @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;
+
+
+}

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;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @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;
+
+
+}

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;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @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;
+
+
+}

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;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @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;
+
+
+}

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;
+
 /**
  * <p>
  * 

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;
+
 /**
  * <p>
  * 
@@ -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;
 

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;
+
 /**
  * <p>
  * 

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;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @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;
+
+
+}

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;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @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;
+
+
+}

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;

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;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @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);
+
+
+    }
+
+
+
+}
+

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;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author xn
+ * @since 2023-09-20
+ */
+@RestController
+@RequestMapping("/dmBchxjbp")
+public class DmBchxjbpController {
+
+}
+

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;
+
+/**
+ * <p>
+ *  前端控制器  套料图
+ * </p>
+ *
+ * @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<DmBchxmxp> getTLTList = dmBchxmxpService.getTLTList(map);
+        return new ResultBean(getTLTList);
+
+    }
+}
+

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;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @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<DmBchxylp> bcLQlList = dmBchxylpService.getBcTJlList(map);
+        return new ResultBean(bcLQlList);
+
+    }
+}
+

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;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author xn
+ * @since 2023-09-15
+ */
+@RestController
+@RequestMapping("/dmBclqjbp")
+public class DmBclqjbpController {
+
+}
+

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;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @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<DmBclqmxp> bcLQlList = dmBclqmxpService.getBcLQlList(map);
+        return new ResultBean(bcLQlList);
+
+    }
+
+}
+

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;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @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<DmBom> listBom = dmBomService.getListBom(map);
+            return  new ResultBean(listBom);
+        }
+
+    @PostMapping("/addListBom")
+    @AuthFunction
+    public ResultBean addListBom(HttpServletRequest req, @RequestBody Map map) throws CustomException {
+        List<DmBom> 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<DmBom> list) throws CustomException {
+        dmBomService.insertBoms(list);
+//
+        return  new ResultBean();
+//        return null;
+    }
+
+}
+

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;

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;
 
 /**

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;

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;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @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<DmWlqd> getTLTList = dmWlqdService.getLJQDList(map);
+        return new ResultBean(getTLTList);
+
+    }
+
+}
+

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;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author xn
+ * @since 2023-09-21
+ */
+@RestController
+@RequestMapping("/dmWpjbp")
+public class DmWpjbpController {
+
+}
+

src/main/java/com/dsic/gj_erp/dao/sy/Dm_zhbmpRepository.java

@@ -20,7 +20,7 @@ public interface Dm_zhbmpRepository extends JpaRepository<Dm_zhbmp,Dm_zhbmp.Prim
 
     List<Dm_zhbmp> 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<Map> findDsdw();
     @Query(nativeQuery = true,value = "select bm, bmsm as  mc from dm_zhbmp where bmlb='BMBM' and (left(bm,3)='023' ) and isnull(ylzd3,'N')<>'Y' ")

src/main/java/com/dsic/gj_erp/mapper/jcsj/DmBchxjbpMapper.java

@@ -0,0 +1,16 @@
+package com.dsic.gj_erp.mapper.jcsj;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.dsic.gj_erp.bean.jcsj.DmBchxjbp;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author xn
+ * @since 2023-09-20
+ */
+public interface DmBchxjbpMapper extends BaseMapper<DmBchxjbp> {
+
+}

src/main/java/com/dsic/gj_erp/mapper/jcsj/DmBchxmxpMapper.java

@@ -0,0 +1,24 @@
+package com.dsic.gj_erp.mapper.jcsj;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.dsic.gj_erp.bean.jcsj.DmBchxmxp;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author xn
+ * @since 2023-09-20
+ */
+public interface DmBchxmxpMapper extends BaseMapper<DmBchxmxp> {
+
+    void  updateWpgg(@Param("dcch")String dcch, @Param("dcpl")String dcpl);
+    void  updateWph(@Param("dcch")String dcch,@Param("dcpl")String dcpl);
+    List<DmBchxmxp> getTLTList(Map map);
+
+}

src/main/java/com/dsic/gj_erp/mapper/jcsj/DmBchxylpMapper.java

@@ -0,0 +1,22 @@
+package com.dsic.gj_erp.mapper.jcsj;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.dsic.gj_erp.bean.jcsj.DmBchxylp;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author xn
+ * @since 2023-09-19
+ */
+public interface DmBchxylpMapper extends BaseMapper<DmBchxylp> {
+
+
+    public List<DmBchxylp> getBcTJlList(Map map);
+
+}

src/main/java/com/dsic/gj_erp/mapper/jcsj/DmBclqjbpMapper.java

@@ -0,0 +1,16 @@
+package com.dsic.gj_erp.mapper.jcsj;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.dsic.gj_erp.bean.jcsj.DmBclqjbp;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author xn
+ * @since 2023-09-15
+ */
+public interface DmBclqjbpMapper extends BaseMapper<DmBclqjbp> {
+
+}

src/main/java/com/dsic/gj_erp/mapper/jcsj/DmBclqmxpMapper.java

@@ -0,0 +1,22 @@
+package com.dsic.gj_erp.mapper.jcsj;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.dsic.gj_erp.bean.jcsj.DmBclqmxp;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author xn
+ * @since 2023-09-15
+ */
+public interface DmBclqmxpMapper extends BaseMapper<DmBclqmxp> {
+
+
+    public List<DmBclqmxp> getBcLQlList(Map map);
+
+}

src/main/java/com/dsic/gj_erp/mapper/jcsj/DmBomMapper.java

@@ -0,0 +1,22 @@
+package com.dsic.gj_erp.mapper.jcsj;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.dsic.gj_erp.bean.jcsj.DmBom;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author xn
+ * @since 2023-09-25
+ */
+public interface DmBomMapper extends BaseMapper<DmBom> {
+
+
+         int insertBoms(List<DmBom> dmMfgDetails);
+         int insertBom(DmBom dmMfgDetails);
+
+}

src/main/java/com/dsic/gj_erp/mapper/jcsj/DmCbxxpMapper.java

@@ -1,7 +1,7 @@
 package com.dsic.gj_erp.mapper.jcsj;
 
-import com.dsic.gj_erp.bean.jcsj.DmCbxxp;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.dsic.gj_erp.bean.jcsj.DmCbxxp;
 import org.apache.ibatis.annotations.Mapper;
 
 /**

src/main/java/com/dsic/gj_erp/mapper/jcsj/DmCzplpMapper.java

@@ -1,7 +1,7 @@
 package com.dsic.gj_erp.mapper.jcsj;
 
-import com.dsic.gj_erp.bean.jcsj.DmCzplp;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.dsic.gj_erp.bean.jcsj.DmCzplp;
 
 /**
  * <p>

src/main/java/com/dsic/gj_erp/mapper/jcsj/DmCzplpNewMapper.java

@@ -1,7 +1,7 @@
 package com.dsic.gj_erp.mapper.jcsj;
 
-import com.dsic.gj_erp.bean.jcsj.DmCzplpNew;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.dsic.gj_erp.bean.jcsj.DmCzplpNew;
 
 /**
  * <p>

src/main/java/com/dsic/gj_erp/mapper/jcsj/DmWlqdMapper.java

@@ -0,0 +1,21 @@
+package com.dsic.gj_erp.mapper.jcsj;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.dsic.gj_erp.bean.jcsj.DmWlqd;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author xn
+ * @since 2023-09-21
+ */
+public interface DmWlqdMapper extends BaseMapper<DmWlqd> {
+
+    List<DmWlqd> getLJQDList(Map map);
+
+}

src/main/java/com/dsic/gj_erp/mapper/jcsj/DmWpjbpMapper.java

@@ -0,0 +1,16 @@
+package com.dsic.gj_erp.mapper.jcsj;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.dsic.gj_erp.bean.jcsj.DmWpjbp;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author xn
+ * @since 2023-09-21
+ */
+public interface DmWpjbpMapper extends BaseMapper<DmWpjbp> {
+
+}

src/main/java/com/dsic/gj_erp/service/jcsj/DmBchxjbpService.java

@@ -0,0 +1,18 @@
+package com.dsic.gj_erp.service.jcsj;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.dsic.gj_erp.bean.jcsj.DmBchxjbp;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author xn
+ * @since 2023-09-20
+ */
+public interface DmBchxjbpService extends IService<DmBchxjbp> {
+
+
+
+}

src/main/java/com/dsic/gj_erp/service/jcsj/DmBchxmxpService.java

@@ -0,0 +1,21 @@
+package com.dsic.gj_erp.service.jcsj;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.dsic.gj_erp.bean.jcsj.DmBchxmxp;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author xn
+ * @since 2023-09-20
+ */
+public interface DmBchxmxpService extends IService<DmBchxmxp> {
+
+    List<DmBchxmxp> getTLTList(Map map);
+
+}

src/main/java/com/dsic/gj_erp/service/jcsj/DmBchxylpService.java

@@ -0,0 +1,21 @@
+package com.dsic.gj_erp.service.jcsj;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.dsic.gj_erp.bean.jcsj.DmBchxylp;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author xn
+ * @since 2023-09-19
+ */
+public interface DmBchxylpService extends IService<DmBchxylp> {
+
+    List<DmBchxylp>getBcTJlList(Map map);
+
+}

src/main/java/com/dsic/gj_erp/service/jcsj/DmBclqjbpService.java

@@ -0,0 +1,16 @@
+package com.dsic.gj_erp.service.jcsj;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.dsic.gj_erp.bean.jcsj.DmBclqjbp;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author xn
+ * @since 2023-09-15
+ */
+public interface DmBclqjbpService extends IService<DmBclqjbp> {
+
+}

src/main/java/com/dsic/gj_erp/service/jcsj/DmBclqmxpService.java

@@ -0,0 +1,21 @@
+package com.dsic.gj_erp.service.jcsj;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.dsic.gj_erp.bean.jcsj.DmBclqmxp;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author xn
+ * @since 2023-09-15
+ */
+public interface DmBclqmxpService extends IService<DmBclqmxp> {
+
+    List<DmBclqmxp>getBcLQlList(Map map);
+
+}

src/main/java/com/dsic/gj_erp/service/jcsj/DmBomService.java

@@ -0,0 +1,24 @@
+package com.dsic.gj_erp.service.jcsj;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.dsic.gj_erp.bean.jcsj.DmBom;
+import com.dsic.gj_erp.exception.CustomException;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author xn
+ * @since 2023-09-25
+ */
+public interface DmBomService extends IService<DmBom> {
+
+
+    List<DmBom>getListBom(Map map) throws CustomException;
+    void  insertBoms(List<DmBom> map) throws CustomException;
+
+}

src/main/java/com/dsic/gj_erp/service/jcsj/DmCbxxpService.java

@@ -1,15 +1,7 @@
 package com.dsic.gj_erp.service.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.baomidou.mybatisplus.extension.service.IService;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.PostMapping;
+import com.dsic.gj_erp.bean.jcsj.DmCbxxp;
 import org.springframework.web.bind.annotation.RequestBody;
 
 import javax.servlet.http.HttpServletRequest;

src/main/java/com/dsic/gj_erp/service/jcsj/DmCzplpNewService.java

@@ -1,8 +1,7 @@
 package com.dsic.gj_erp.service.jcsj;
 
-import cn.hutool.http.HttpRequest;
-import com.dsic.gj_erp.bean.jcsj.DmCzplpNew;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.dsic.gj_erp.bean.jcsj.DmCzplpNew;
 import com.dsic.gj_erp.bean.jcsj.excel.PlExcel;
 
 import javax.servlet.http.HttpServletRequest;

src/main/java/com/dsic/gj_erp/service/jcsj/DmCzplpService.java

@@ -1,7 +1,7 @@
 package com.dsic.gj_erp.service.jcsj;
 
-import com.dsic.gj_erp.bean.jcsj.DmCzplp;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.dsic.gj_erp.bean.jcsj.DmCzplp;
 
 /**
  * <p>

src/main/java/com/dsic/gj_erp/service/jcsj/DmWlqdService.java

@@ -0,0 +1,21 @@
+package com.dsic.gj_erp.service.jcsj;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.dsic.gj_erp.bean.jcsj.DmWlqd;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author xn
+ * @since 2023-09-21
+ */
+public interface DmWlqdService extends IService<DmWlqd> {
+
+    List<DmWlqd> getLJQDList(Map map);
+
+}

src/main/java/com/dsic/gj_erp/service/jcsj/DmWpjbpService.java

@@ -0,0 +1,16 @@
+package com.dsic.gj_erp.service.jcsj;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.dsic.gj_erp.bean.jcsj.DmWpjbp;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author xn
+ * @since 2023-09-21
+ */
+public interface DmWpjbpService extends IService<DmWpjbp> {
+
+}

src/main/java/com/dsic/gj_erp/service/jcsj/impl/DmBchxjbpServiceImpl.java

@@ -0,0 +1,20 @@
+package com.dsic.gj_erp.service.jcsj.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.dsic.gj_erp.bean.jcsj.DmBchxjbp;
+import com.dsic.gj_erp.mapper.jcsj.DmBchxjbpMapper;
+import com.dsic.gj_erp.service.jcsj.DmBchxjbpService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author xn
+ * @since 2023-09-20
+ */
+@Service
+public class DmBchxjbpServiceImpl extends ServiceImpl<DmBchxjbpMapper, DmBchxjbp> implements DmBchxjbpService {
+
+}

src/main/java/com/dsic/gj_erp/service/jcsj/impl/DmBchxmxpServiceImpl.java

@@ -0,0 +1,29 @@
+package com.dsic.gj_erp.service.jcsj.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.dsic.gj_erp.bean.jcsj.DmBchxmxp;
+import com.dsic.gj_erp.mapper.jcsj.DmBchxmxpMapper;
+import com.dsic.gj_erp.service.jcsj.DmBchxmxpService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author xn
+ * @since 2023-09-20
+ */
+@Service
+public class DmBchxmxpServiceImpl extends ServiceImpl<DmBchxmxpMapper, DmBchxmxp> implements DmBchxmxpService {
+    @Autowired
+    DmBchxmxpMapper dmBchxmxpMapper;
+    @Override
+    public List<DmBchxmxp> getTLTList(Map map) {
+        return dmBchxmxpMapper.getTLTList(map);
+    }
+}

src/main/java/com/dsic/gj_erp/service/jcsj/impl/DmBchxylpServiceImpl.java

@@ -0,0 +1,30 @@
+package com.dsic.gj_erp.service.jcsj.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.dsic.gj_erp.bean.jcsj.DmBchxylp;
+import com.dsic.gj_erp.mapper.jcsj.DmBchxylpMapper;
+import com.dsic.gj_erp.service.jcsj.DmBchxylpService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author xn
+ * @since 2023-09-19
+ */
+@Service
+public class DmBchxylpServiceImpl extends ServiceImpl<DmBchxylpMapper, DmBchxylp> implements DmBchxylpService {
+
+    @Autowired
+    DmBchxylpMapper dmBchxylpMapper;
+    @Override
+    public List<DmBchxylp> getBcTJlList(Map map) {
+        return dmBchxylpMapper.getBcTJlList(map);
+    }
+}

src/main/java/com/dsic/gj_erp/service/jcsj/impl/DmBclqjbpServiceImpl.java

@@ -0,0 +1,20 @@
+package com.dsic.gj_erp.service.jcsj.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.dsic.gj_erp.bean.jcsj.DmBclqjbp;
+import com.dsic.gj_erp.mapper.jcsj.DmBclqjbpMapper;
+import com.dsic.gj_erp.service.jcsj.DmBclqjbpService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author xn
+ * @since 2023-09-15
+ */
+@Service
+public class DmBclqjbpServiceImpl extends ServiceImpl<DmBclqjbpMapper, DmBclqjbp> implements DmBclqjbpService {
+
+}

src/main/java/com/dsic/gj_erp/service/jcsj/impl/DmBclqmxpServiceImpl.java

@@ -0,0 +1,40 @@
+package com.dsic.gj_erp.service.jcsj.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.dsic.gj_erp.bean.jcsj.DmBclqmxp;
+import com.dsic.gj_erp.mapper.jcsj.DmBclqmxpMapper;
+import com.dsic.gj_erp.service.jcsj.DmBclqmxpService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author xn
+ * @since 2023-09-15
+ */
+@Service
+public class DmBclqmxpServiceImpl extends ServiceImpl<DmBclqmxpMapper, DmBclqmxp> implements DmBclqmxpService {
+
+    @Autowired
+    DmBclqmxpMapper dmBclqmxpMapper;
+    @Override
+    public List<DmBclqmxp> getBcLQlList(Map map) {
+        List<DmBclqmxp> bcLQlList = dmBclqmxpMapper.getBcLQlList(map);
+        bcLQlList.forEach(e->{
+                if(e.getSl().compareTo(BigDecimal.ZERO)==0){
+                    e.setDztlzl(e.getLjzl());
+                }else{
+                    e.setDztlzl(e.getLjzl().divide(e.getSl(),BigDecimal.ROUND_CEILING).setScale(2, BigDecimal.ROUND_HALF_UP));
+                }
+                e.setTlshbl(e.getLjzl().divide(e.getShzl(),BigDecimal.ROUND_CEILING).setScale(2, BigDecimal.ROUND_HALF_UP));
+        });
+        return bcLQlList;
+    }
+}

src/main/java/com/dsic/gj_erp/service/jcsj/impl/DmBomServiceImpl.java

@@ -0,0 +1,50 @@
+package com.dsic.gj_erp.service.jcsj.impl;
+
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.dsic.gj_erp.bean.jcsj.DmBom;
+import com.dsic.gj_erp.exception.CustomException;
+import com.dsic.gj_erp.mapper.jcsj.DmBomMapper;
+import com.dsic.gj_erp.service.jcsj.DmBomService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author xn
+ * @since 2023-09-25
+ */
+@Service
+public class DmBomServiceImpl extends ServiceImpl<DmBomMapper, DmBom> implements DmBomService {
+
+    @Autowired
+    BomUploadServiceImpl bomUploadService;
+    @Override
+    public List<DmBom> getListBom(Map map) throws CustomException {
+        List<DmBom> list = this.list(new QueryWrapper<DmBom>().eq("sjch", map.get("dcch"))
+            .eq(StrUtil.isNotEmpty((String) map.get("fd")), "fd", map.get("dcfd"))
+            .eq(StrUtil.isNotEmpty((String) map.get("pl")), "fd", map.get("dcpl"))
+        );
+
+        if(list.size()<=0){
+
+            throw new CustomException(10105, "为老系统数据 请点击生成Bom");
+        }
+        return list;
+    }
+
+    @Override
+    public void insertBoms(List<DmBom> map) throws CustomException {
+        map.forEach(e->{
+            baseMapper.insertBom(e);
+        });
+
+    }
+}

src/main/java/com/dsic/gj_erp/service/jcsj/impl/DmCbxxpServiceImpl.java

@@ -3,11 +3,10 @@ package com.dsic.gj_erp.service.jcsj.impl;
 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.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.dsic.gj_erp.bean.jcsj.DmCbxxp;
 import com.dsic.gj_erp.mapper.jcsj.DmCbxxpMapper;
 import com.dsic.gj_erp.service.jcsj.DmCbxxpService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

src/main/java/com/dsic/gj_erp/service/jcsj/impl/DmCzplpNewServiceImpl.java

@@ -4,16 +4,17 @@ import cn.hutool.core.bean.BeanUtil;
 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.toolkit.IdWorker;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.dsic.gj_erp.bean.jcsj.DmCbxxp;
 import com.dsic.gj_erp.bean.jcsj.DmCzplp;
 import com.dsic.gj_erp.bean.jcsj.DmCzplpNew;
 import com.dsic.gj_erp.bean.jcsj.excel.PlExcel;
+import com.dsic.gj_erp.bean.jhgk.DmTzjh;
 import com.dsic.gj_erp.mapper.jcsj.DmCzplpNewMapper;
 import com.dsic.gj_erp.service.jcsj.DmCbxxpService;
 import com.dsic.gj_erp.service.jcsj.DmCzplpNewService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.dsic.gj_erp.service.jcsj.DmCzplpService;
+import com.dsic.gj_erp.service.jhgk.DmTzjhService;
 import com.dsic.gj_erp.service.sy.SYService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -44,6 +45,9 @@ public class DmCzplpNewServiceImpl extends ServiceImpl<DmCzplpNewMapper, DmCzplp
     @Autowired
     SYService syService;
 
+    @Autowired
+    DmTzjhService dmTzjhService;
+
     /**
      *
      * @param list
@@ -55,8 +59,8 @@ public class DmCzplpNewServiceImpl extends ServiceImpl<DmCzplpNewMapper, DmCzplp
     @Transactional(rollbackFor = Exception.class)
     public Map uploadPl(List<PlExcel> list, String project, String isupload, HttpServletRequest req) {
         Map returnMap = new HashMap();
-        List<String> fds = list.stream().filter(f -> StringUtils.isNotBlank(f.getDcPL())).map(PlExcel::getDcPL).collect(Collectors.toList());
-        List<DmCzplpNew> fdList = this.list(new QueryWrapper<DmCzplpNew>().in("dc_fd", fds));
+        List<String> pls = list.stream().filter(f -> StringUtils.isNotBlank(f.getDcPL())).map(PlExcel::getDcPL).collect(Collectors.toList());
+        List<DmCzplpNew> fdList = this.list(new QueryWrapper<DmCzplpNew>().in("dc_pl", pls));
 //        if(fdList.size()>0){
 //          // 是否覆盖之前导入的数据
 //          if(!isupload.equals("01")){
@@ -70,19 +74,19 @@ public class DmCzplpNewServiceImpl extends ServiceImpl<DmCzplpNewMapper, DmCzplp
         for (PlExcel plExcel : list) {
             Map map = getPlCount(plExcel);
             int plCount = (int) map.get("plcount");
-            String pls = (String) map.get("pls");
+            String fds = (String) map.get("fds");
             Map<String, Object> stringObjectMap = BeanUtil.beanToMap(plExcel);
-            DmCzplpNew dmCzplpNewOld = fdList.stream().filter(fst -> plExcel.getDcPL().equals(fst.getDcFd())).findFirst().orElse(null);
+            DmCzplpNew dmCzplpNewOld = fdList.stream().filter(fst -> plExcel.getDcPL().equals(fst.getDcPl())).findFirst().orElse(null);
 
             if (null != dmCzplpNewOld) {
-                this.remove(new QueryWrapper<DmCzplpNew>().eq("dc_fd", plExcel.getDcPL()));
+                this.remove(new QueryWrapper<DmCzplpNew>().eq("dc_pl", plExcel.getDcPL()));
                 for (int i = 1; i <plCount; i++) {
                     DmCzplpNew dmCzplpNew = plexcltoDmczplNewUp(plExcel, stringObjectMap, req, i, dmCzplpNewOld);
                     dmCzplpNews.add(dmCzplpNew);
                 }
             } else {
                 for (int i = 1; i <plCount; i++) {
-                    Map mapBean = plexcltoDmczplNew(plExcel, stringObjectMap, req, i, pls);
+                    Map mapBean = plexcltoDmczplNew(plExcel, stringObjectMap, req, i, fds);
                     dmCzplpNews.add((DmCzplpNew) mapBean.get("dmCzplpNew"));
                     dmCzplps.add((DmCzplp) mapBean.get("dmCzplp"));
                 }
@@ -90,7 +94,21 @@ public class DmCzplpNewServiceImpl extends ServiceImpl<DmCzplpNewMapper, DmCzplp
         }
         if (dmCzplpNews.size() > 0) {
             this.saveBatch(dmCzplpNews);
+            List<DmTzjh>tzjhs=new ArrayList<>();
+            dmCzplpNews.forEach(e->{
+                DmTzjh tzjh=new DmTzjh();
+                tzjh.setDcPl(e.getDcPl());
+                tzjh.setDcFd(e.getDcFd());
+                tzjh.setDcCh(e.getDcCh());
+                tzjh.setXfqTlt(e.getXfqTlt());
+                tzjh.setXfqLqb(e.getXfqLqb());
+                tzjh.setXfqPtb(e.getXfqPtb());
+                tzjhs.add(tzjh);
+            });
+            dmTzjhService.saveBatch(tzjhs);
         }
+
+
         if (dmCzplps.size() > 0) {
             dmCzplpService.saveBatch(dmCzplps);
         }
@@ -146,13 +164,13 @@ public class DmCzplpNewServiceImpl extends ServiceImpl<DmCzplpNewMapper, DmCzplp
         return map;
     }
 
-    public Map plexcltoDmczplNew(PlExcel plExcel, Map stringObjectMap, HttpServletRequest req, int i, String pls) {
+    public Map plexcltoDmczplNew(PlExcel plExcel, Map stringObjectMap, HttpServletRequest req, int i, String fds) {
         DmCzplpNew dmCzplpNew = new DmCzplpNew();
         DmCzplp dmCzplp = new DmCzplp();
         String id = syService.f_getpjh("DM", "DM", "CZPL");
         dmCzplp.setId(id);
         dmCzplp.setDcCh(plExcel.getDcCh());
-        dmCzplp.setDcFd(pls);
+        dmCzplp.setDcFd(fds);
         dmCzplp.setZl(plExcel.getZl());
         dmCzplp.setDcPl(plExcel.getDcPL());
         dmCzplp.setLrr((String) req.getAttribute("yhms"));
@@ -250,7 +268,7 @@ public class DmCzplpNewServiceImpl extends ServiceImpl<DmCzplpNewMapper, DmCzplp
         dmCzplpNew.setJsbs(plExcel.getJsbs());
         dmCzplpNew.setZt("0");
         dmCzplpNew.setId(id);
-        String rq = "";
+        String rq ="";
         String rqsm = "";
         int xfqLqb = DateUtil.compare(DateUtil.parse(plExcel.getXfqLqb()), DateUtil.parse(dmCzplpNewOld.getXfqLqb()), "MM");
         if (xfqLqb == 0) {
@@ -258,6 +276,9 @@ public class DmCzplpNewServiceImpl extends ServiceImpl<DmCzplpNewMapper, DmCzplp
             if (xfqLqb != 0) {
                 rqsm = "变更";
                 rq = dmCzplpNewOld.getXfqLqb() + " " + plExcel.getXfqLqb();
+            }else{
+                rqsm = dmCzplpNewOld.getXfqLqb1sm();
+                rq = dmCzplpNewOld.getXfqLqb1() ;
             }
         } else if (xfqLqb < 0) {
             rqsm = "托期";
@@ -274,6 +295,9 @@ public class DmCzplpNewServiceImpl extends ServiceImpl<DmCzplpNewMapper, DmCzplp
             if (xzjsq != 0) {
                 rqsm = "变更";
                 rq = dmCzplpNewOld.getXzjsq() + " " + plExcel.getXzjsq();
+            }else{
+                rqsm = dmCzplpNewOld.getXzjsqsm();
+                rq = dmCzplpNewOld.getXzjsq1() ;
             }
         } else if (xzjsq < 0) {
             rqsm = "托期";
@@ -290,6 +314,9 @@ public class DmCzplpNewServiceImpl extends ServiceImpl<DmCzplpNewMapper, DmCzplp
             if (xfqTlt != 0) {
                 rqsm = "变更";
                 rq = dmCzplpNewOld.getXfqTlt() + " " + plExcel.getXfqTlt();
+            }else{
+                rqsm = dmCzplpNewOld.getXfqTltsm();
+                rq = dmCzplpNewOld.getXfqTlt1() ;
             }
         } else if (xfqTlt < 0) {
             rqsm = "托期";
@@ -306,6 +333,9 @@ public class DmCzplpNewServiceImpl extends ServiceImpl<DmCzplpNewMapper, DmCzplp
             if (dzjsq != 0) {
                 rqsm = "变更";
                 rq = dmCzplpNewOld.getDzjsq() + " " + plExcel.getDzjsq();
+            }else{
+                rqsm = dmCzplpNewOld.getDzjsqsm();
+                rq = dmCzplpNewOld.getDzjsq1() ;
             }
         } else if (dzjsq < 0) {
             rqsm = "托期";
@@ -322,6 +352,9 @@ public class DmCzplpNewServiceImpl extends ServiceImpl<DmCzplpNewMapper, DmCzplp
             if (gjks != 0) {
                 rqsm = "变更";
                 rq = dmCzplpNewOld.getGjks() + " " + plExcel.getGjks();
+            }else{
+                rqsm = dmCzplpNewOld.getGjkssm();
+                rq = dmCzplpNewOld.getGjks1() ;
             }
         } else if (gjks < 0) {
             rqsm = "托期";
@@ -338,6 +371,9 @@ public class DmCzplpNewServiceImpl extends ServiceImpl<DmCzplpNewMapper, DmCzplp
             if (xfqDhqd != 0) {
                 rqsm = "变更";
                 rq = dmCzplpNewOld.getXfqDhqd() + " " + plExcel.getXfqDhqd();
+            }else{
+                rqsm = dmCzplpNewOld.getXfqDhqd1sm();
+                rq = dmCzplpNewOld.getXfqDhqd1() ;
             }
         } else if (xfqDhqd < 0) {
             rqsm = "托期";
@@ -363,8 +399,8 @@ public class DmCzplpNewServiceImpl extends ServiceImpl<DmCzplpNewMapper, DmCzplp
     public List<DmCzplpNew> getCzplList(Map map) {
         QueryWrapper<DmCzplpNew> qw = new QueryWrapper<>();
         qw.eq(StrUtil.isNotEmpty((String) map.get("dcch")), "dc_ch", (String) map.get("dcch"));
-        qw.eq(StrUtil.isNotEmpty((String) map.get("dcfd")), "dc_fd", (String) map.get("dcfd"));
-        qw.orderBy(true, true, "dc_fd");
+        qw.eq(StrUtil.isNotEmpty((String) map.get("dcfd")), "dc_pl", (String) map.get("dcpl"));
+        qw.orderBy(true, true, "len(dc_pl)","dc_pl");
         List<DmCzplpNew> list = this.list(qw);
         return list;
     }

src/main/java/com/dsic/gj_erp/service/jcsj/impl/DmCzplpServiceImpl.java

@@ -1,9 +1,9 @@
 package com.dsic.gj_erp.service.jcsj.impl;
 
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.dsic.gj_erp.bean.jcsj.DmCzplp;
 import com.dsic.gj_erp.mapper.jcsj.DmCzplpMapper;
 import com.dsic.gj_erp.service.jcsj.DmCzplpService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
 /**

src/main/java/com/dsic/gj_erp/service/jcsj/impl/DmWlqdServiceImpl.java

@@ -0,0 +1,31 @@
+package com.dsic.gj_erp.service.jcsj.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.dsic.gj_erp.bean.jcsj.DmWlqd;
+import com.dsic.gj_erp.mapper.jcsj.DmWlqdMapper;
+import com.dsic.gj_erp.service.jcsj.DmWlqdService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author xn
+ * @since 2023-09-21
+ */
+@Service
+public class DmWlqdServiceImpl extends ServiceImpl<DmWlqdMapper, DmWlqd> implements DmWlqdService {
+
+    @Autowired
+    DmWlqdMapper dmWlqdMapper;
+
+    @Override
+    public List<DmWlqd> getLJQDList(Map map) {
+        return dmWlqdMapper.getLJQDList(map);
+    }
+}

src/main/java/com/dsic/gj_erp/service/jcsj/impl/DmWpjbpServiceImpl.java

@@ -0,0 +1,20 @@
+package com.dsic.gj_erp.service.jcsj.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.dsic.gj_erp.bean.jcsj.DmWpjbp;
+import com.dsic.gj_erp.mapper.jcsj.DmWpjbpMapper;
+import com.dsic.gj_erp.service.jcsj.DmWpjbpService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author xn
+ * @since 2023-09-21
+ */
+@Service
+public class DmWpjbpServiceImpl extends ServiceImpl<DmWpjbpMapper, DmWpjbp> implements DmWpjbpService {
+
+}

src/main/java/com/dsic/gj_erp/util/CodeGenerator.java

@@ -28,9 +28,9 @@ public class CodeGenerator {
         DataSourceConfig dataSourceConfig = new DataSourceConfig();
         dataSourceConfig.setDbType(DbType.SQL_SERVER)//数据库类型
             .setDriverName("com.microsoft.sqlserver.jdbc.SQLServerDriver")
-            .setUrl("jdbc:sqlserver://localhost:1433;DatabaseName=gj_erp") //250 是 tribon
+            .setUrl("jdbc:sqlserver://192.168.3.250:1433;DatabaseName=gj_erp") //250 是 tribon
             .setUsername("sa")
-            .setPassword("123456");
+            .setPassword("gjerp");
         //3、策略配置
         StrategyConfig strategyConfig = new StrategyConfig();
         strategyConfig.setCapitalMode(false)//开启全局大写命名
@@ -39,20 +39,20 @@ public class CodeGenerator {
             // .setTablePrefix("tb_")//表名前缀
             .setEntityLombokModel(true)//使用lombok
             .setRestControllerStyle(true)
-            .setInclude(new String[]{"QSyfunp"});
+            .setInclude(new String[]{"dm_bom"});
 
         //.setInclude("表1","表2");//逆向工程使用的表
         //4、包名策略配置
         PackageConfig packageConfig = new PackageConfig();
         //设置包名的parent
-        packageConfig.setParent("com.dsic.xzerp")
-            .setMapper("mapper.scgl")
-            .setService("service.scgl")
-            .setServiceImpl("service.scgl.impl")
-            .setController("controller.scgl")
-            .setEntity("bean.scgl")
+        packageConfig.setParent("com.dsic.gj_erp")
+            .setMapper("mapper.jcsj")
+            .setService("service.jcsj")
+            .setServiceImpl("service.jcsj.impl")
+            .setController("controller.jcsj")
+            .setEntity("bean.jcsj")
             //设置xml文件的目录
-            .setXml("mapper.scgl");
+            .setXml("mapper.jcsj");
         //设置xml文件的目录
 
 //

src/main/java/com/dsic/gj_erp/util/MyFileUtil.java

@@ -0,0 +1,38 @@
+package com.dsic.gj_erp.util;
+
+import java.io.File;
+
+/**
+ * FileUtil:
+ *
+ * @author xhj
+ * @date 2023/09/15
+ */
+public class MyFileUtil {
+
+    public static boolean deleteFolder(File folder) {
+        if (folder == null || !folder.exists()) {
+            return false; // 文件夹不存在或为空，删除失败
+        }
+
+        if (folder.isDirectory()) {
+            File[] files = folder.listFiles();
+            if (files != null) {
+                for (File file : files) {
+                    if (file.isDirectory()) {
+                        // 递归删除子文件夹
+                        deleteFolder(file);
+                    } else {
+                        // 删除文件
+                        if (!file.delete()) {
+                            System.out.println("无法删除文件: " + file);
+                        }
+                    }
+                }
+            }
+        }
+
+        // 删除空文件夹
+        return folder.delete();
+    }
+}

src/main/resources/application-dev.properties

@@ -2,8 +2,9 @@ server.port=8081
 server.tomcat.uri-encoding=utf-8
 
 spring.datasource.driverClassName=com.microsoft.sqlserver.jdbc.SQLServerDriver
-spring.datasource.url=jdbc:sqlserver://localhost:1433;DatabaseName=gj_erp
+#spring.datasource.url=jdbc:sqlserver://localhost:1433;DatabaseName=gj_erp
+spring.datasource.url=jdbc:sqlserver://192.168.3.250:1433;DatabaseName=gj_erp
 spring.datasource.username=sa
-spring.datasource.password=123456
+spring.datasource.password=gjerp
 
 spring.mvc.throw-exception-if-no-handler-found=true

src/main/resources/mappers/jcsj/DmBchxjbpMapper.xml

@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.dsic.gj_erp.mapper.jcsj.DmBchxjbpMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.dsic.gj_erp.bean.jcsj.DmBchxjbp">
+        <id column="HXBH" property="hxbh" />
+        <result column="DC_CH" property="dcCh" />
+        <result column="DC_CM" property="dcCm" />
+        <result column="DC_FD" property="dcFd" />
+        <result column="DC_PL" property="dcPl" />
+        <result column="DC_ZL" property="dcZl" />
+        <result column="CLMC" property="clmc" />
+        <result column="TZBH1" property="tzbh1" />
+        <result column="SHZL" property="shzl" />
+        <result column="ZYRQ" property="zyrq" />
+        <result column="GCBH" property="gcbh" />
+        <result column="HXCD" property="hxcd" />
+        <result column="TXBL" property="txbl" />
+        <result column="ZDRQ" property="zdrq" />
+        <result column="YLZD3" property="ylzd3" />
+        <result column="WPGG" property="wpgg" />
+        <result column="LJSL" property="ljsl" />
+        <result column="DC_LPH" property="dcLph" />
+        <result column="YLZD6" property="ylzd6" />
+        <result column="TZBH" property="tzbh" />
+        <result column="CLZL" property="clzl" />
+        <result column="HXFL" property="hxfl" />
+        <result column="XTRQ" property="xtrq" />
+        <result column="WPXH" property="wpxh" />
+        <result column="YLZD1" property="ylzd1" />
+        <result column="YLZD4" property="ylzd4" />
+        <result column="YCLZL" property="yclzl" />
+        <result column="BZ" property="bz" />
+        <result column="YLZD5" property="ylzd5" />
+        <result column="YLZL" property="ylzl" />
+        <result column="ZDR" property="zdr" />
+        <result column="YLBH" property="ylbh" />
+        <result column="WGRQ" property="wgrq" />
+        <result column="YLZD2" property="ylzd2" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        DC_CH, DC_CM, DC_FD, DC_PL, DC_ZL, CLMC, TZBH1, SHZL, ZYRQ, GCBH, HXCD, TXBL, ZDRQ, YLZD3, WPGG, LJSL, DC_LPH, YLZD6, TZBH, CLZL, HXFL, XTRQ, WPXH, YLZD1, YLZD4, YCLZL, BZ, YLZD5, HXBH, YLZL, ZDR, YLBH, WGRQ, YLZD2
+    </sql>
+
+</mapper>

src/main/resources/mappers/jcsj/DmBchxmxpMapper.xml

@@ -0,0 +1,135 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.dsic.gj_erp.mapper.jcsj.DmBchxmxpMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.dsic.gj_erp.bean.jcsj.DmBchxmxp">
+        <id column="XH" property="xh" />
+        <result column="WPH" property="wph" />
+        <result column="SL" property="sl" />
+        <result column="XGR" property="xgr" />
+        <result column="XGRQ" property="xgrq" />
+        <result column="LJXX" property="ljxx" />
+        <result column="ljtz" property="ljtz" />
+        <result column="GCBH_z" property="gcbhZ" />
+        <result column="DC_CH_z" property="dcChZ" />
+        <result column="DC_CM_z" property="dcCmZ" />
+        <result column="DC_FD_z" property="dcFdZ" />
+        <result column="DC_PL_z" property="dcPlZ" />
+        <result column="DC_ZL_z" property="dcZlZ" />
+        <result column="TJBH_z" property="tjbhZ" />
+        <result column="XTRQ_z" property="xtrqZ" />
+        <result column="YLBH_z" property="ylbhZ" />
+        <result column="WPGG_z" property="wpggZ" />
+        <result column="WPXH_z" property="wpxhZ" />
+        <result column="TXBL_z" property="txblZ" />
+        <result column="LJSL_z" property="ljslZ" />
+        <result column="YCLZL_z" property="yclzlZ" />
+        <result column="SHZL_z" property="shzlZ" />
+        <result column="CLZL_z" property="clzlZ" />
+        <result column="YLZL_z" property="ylzlZ" />
+        <result column="HXCD_z" property="hxcdZ" />
+        <result column="DC_LPH_z" property="dcLphZ" />
+        <result column="WGRQ_z" property="wgrqZ" />
+        <result column="ZYRQ_z" property="zyrqZ" />
+        <result column="YLZD1_z" property="ylzd1Z" />
+        <result column="YLZD2_z" property="ylzd2Z" />
+        <result column="YLZD4_z" property="ylzd4Z" />
+        <result column="HXFL_z" property="hxflZ" />
+        <result column="CLMC_z" property="clmcZ" />
+        <result column="TZBH1_z" property="tzbh1Z" />
+        <result column="zt" property="zt" />
+        <result column="ZZCJ" property="zzcj" />
+        <result column="dksl" property="dksl" />
+        <result column="cd_qgkc" property="cdQgkc" />
+        <result column="pkbs" property="pkbs" />
+        <result column="pklx" property="pklx" />
+        <result column="pkds" property="pkds" />
+        <result column="cd_pk" property="cdPk" />
+        <result column="dmbs" property="dmbs" />
+        <result column="cd_dm" property="cdDm" />
+        <result column="qmbs" property="qmbs" />
+        <result column="YLZD3" property="ylzd3" />
+        <result column="ZDR_z" property="zdrZ" />
+        <result column="YLZD6" property="ylzd6" />
+        <result column="BZ" property="bz" />
+        <result column="YLZD4" property="ylzd4" />
+        <result column="YLZD5_z" property="ylzd5Z" />
+        <result column="YLZD1" property="ylzd1" />
+        <result column="ZDRQ_z" property="zdrqZ" />
+        <result column="LJBH" property="ljbh" />
+        <result column="YLZD6_z" property="ylzd6Z" />
+        <result column="YLZD3_z" property="ylzd3Z" />
+        <result column="YLZD2" property="ylzd2" />
+        <result column="HXBH" property="hxbh" />
+        <result column="BZ_z" property="bzZ" />
+        <result column="YLZD5" property="ylzd5" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        XH, WPH, SL, XGR, XGRQ, LJXX, ljtz, GCBH_z, DC_CH_z, DC_CM_z, DC_FD_z, DC_PL_z, DC_ZL_z, TJBH_z, XTRQ_z, YLBH_z, WPGG_z, WPXH_z, TXBL_z, LJSL_z, YCLZL_z, SHZL_z, CLZL_z, YLZL_z, HXCD_z, DC_LPH_z, WGRQ_z, ZYRQ_z, YLZD1_z, YLZD2_z, YLZD4_z, HXFL_z, CLMC_z, TZBH1_z, zt, ZZCJ, dksl, cd_qgkc, pkbs, pklx, pkds, cd_pk, dmbs, cd_dm, qmbs, YLZD3, ZDR_z, YLZD6, BZ, YLZD4, YLZD5_z, YLZD1, ZDRQ_z, LJBH, YLZD6_z, YLZD3_z, YLZD2, HXBH, BZ_z, YLZD5
+    </sql>
+
+
+    <update id="updateWpgg" parameterType="string">
+        update dm_bchxjbp set wpgg = left(wpgg,charindex('*',wpgg) -1 -2 ) + '*' + right(wpgg,len(wpgg) - charindex('*',wpgg))
+        where charindex('*',wpgg)-1 >= 1
+          and hxfl = 'B'
+          and right(left(wpgg,charindex('*',wpgg)-1),2) = '.0'
+and dc_ch=#{dcch} and dc_pl=#{dcpl}
+
+    </update>
+
+    <update id="updateWph" parameterType="string">
+        update dm_bchxmxp
+        set wph = left(wph,charindex('__',wph) - 1  )  ,
+            ljtz = right(wph,len(wph) - charindex('__',wph) - 1 )
+        from dm_bchxjbp
+        where dm_bchxmxp.hxbh = dm_bchxjbp.hxbh
+          and   charindex('__',dm_bchxmxp.wph) -1 >= 1
+          and dc_ch=#{dcch} and dc_pl=#{dcpl}
+
+    </update>
+
+    <select id="getTLTList" resultType="com.dsic.gj_erp.bean.jcsj.DmBchxmxp" parameterType="map">
+        SELECT RTRIM(DM_BCHXJBP.DC_CH) AS dcCHz,
+               RTRIM(DM_BCHXJBP.DC_PL) AS dcPLz,
+               RTRIM(DM_BCHXJBP.YLZD1) AS ylZD1z,
+               RTRIM(DM_BCHXJBP.DC_CM) AS dcCMz,
+               RTRIM(DM_BCHXMXP.WPH) AS WPH,
+               DM_BCHXMXP.SL,
+        DM_BCHXJBP.ZDR as zdrZ,
+        DM_BCHXJBP.ZDRQ AS ZDRQZ,
+               RTRIM(DM_BCHXMXP.BZ) AS BZ,
+               RTRIM(DM_BCHXMXP.XGR) AS XGR,
+               RTRIM(DM_BCHXMXP.XGRQ) AS XGRQ,
+               RTRIM(DM_BCHXMXP.LJBH) AS LJBH,
+               RTRIM(DM_BCHXMXP.LJXX) AS LJXX,
+               RTRIM(DM_BCHXJBP.GCBH) AS gcBHz,
+               DM_BCHXJBP.hxcd AS hxcdz,
+               DM_BCHXJBP.ylzd4 AS YLZD4z,
+                DM_BCHXMXP.zzcj,
+                DM_BCHXJBP.DC_ZL as dczlZ,
+               RTRIM(DM_BCHXJBP.DC_FD) AS dcFDz,
+               RTRIM(DM_BCHXJBP.TZBH) AS tzBHz,
+               RTRIM(DM_BCHXJBP.HXFL) AS hxFLz,
+               RTRIM(DM_BCHXJBP.WPGG) AS wpggz,
+               RTRIM(DM_BCHXJBP.WPXH) AS wpxhz,
+               DM_BCHXJBP.LJSL AS LJSLz,
+               RTRIM(DM_BCHXJBP.dc_zl) AS dc_zl
+        FROM DM_BCHXMXP,DM_BCHXJBP
+        WHERE DM_BCHXMXP.HXBH = DM_BCHXJBP.HXBH
+        <if test=" dcpl!=null and dcpl!=''">
+            and   DM_BCHXJBP.dc_pl=#{dcpl}
+        </if>
+        <if test=" dcch!=null and dcch!=''">
+            and   DM_BCHXJBP.DC_CH=#{dcch}
+        </if>
+
+        <if test=" hxfl!=null and hxfl!=''">
+            and   DM_BCHXJBP.HXFL=#{hxfl}
+        </if>
+    </select>
+
+</mapper>

src/main/resources/mappers/jcsj/DmBchxylpMapper.xml

@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.dsic.gj_erp.mapper.jcsj.DmBchxylpMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.dsic.gj_erp.bean.jcsj.DmBchxylp">
+        <id column="hxbh" property="hxbh" />
+        <result column="ylbh" property="ylbh" />
+        <result column="tzbh" property="tzbh" />
+        <result column="hxfl" property="hxfl" />
+        <result column="wpgg" property="wpgg" />
+        <result column="wpxh" property="wpxh" />
+        <result column="bz" property="bz" />
+        <result column="zdr" property="zdr" />
+        <result column="zdrq" property="zdrq" />
+        <result column="ylzd1" property="ylzd1" />
+        <result column="dc_ch" property="dcCh" />
+        <result column="dc_pl" property="dcPl" />
+        <result column="dc_zl" property="dcZl" />
+        <result column="sfyl" property="sfyl" />
+        <result column="ylgg" property="ylgg" />
+        <result column="sl" property="sl" />
+        <result column="ylsl" property="ylsl" />
+        <result column="xcmc" property="xcmc" />
+        <result column="xccd" property="xccd" />
+        <result column="ylcd" property="ylcd" />
+        <result column="ZZCJ" property="zzcj" />
+        <result column="drry" property="drry" />
+        <result column="drrq" property="drrq" />
+        <result column="drcs" property="drcs" />
+        <result column="bgr" property="bgr" />
+        <result column="ylzd6" property="ylzd6" />
+        <result column="rkph" property="rkph" />
+        <result column="kwh" property="kwh" />
+        <result column="ylzd4" property="ylzd4" />
+        <result column="xh" property="xh" />
+        <result column="ylzd5" property="ylzd5" />
+        <result column="rkbs" property="rkbs" />
+        <result column="ylzd2" property="ylzd2" />
+        <result column="rkrq" property="rkrq" />
+        <result column="jldw" property="jldw" />
+        <result column="ylzd3" property="ylzd3" />
+        <result column="ylzl" property="ylzl" />
+        <result column="drbs" property="drbs" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        ylbh, tzbh, hxfl, wpgg, wpxh, bz, zdr, zdrq, ylzd1, dc_ch, dc_pl, dc_zl, sfyl, ylgg, sl, ylsl, xcmc, xccd, ylcd, ZZCJ, drry, drrq, drcs, bgr, hxbh, ylzd6, rkph, kwh, ylzd4, xh, ylzd5, rkbs, ylzd2, rkrq, jldw, ylzd3, ylzl, drbs
+    </sql>
+
+    <select id="getBcTJlList" resultType="com.dsic.gj_erp.bean.jcsj.DmBchxylp" parameterType="map">
+        SELECT dm_bchxylp.hxbh,
+               dm_bchxylp.xh,
+               dm_bchxylp.ylbh,
+               dm_bchxylp.tzbh,
+               dm_bchxylp.hxfl,
+               dm_bchxylp.wpgg,
+               dm_bchxylp.wpxh,
+               dm_bchxylp.jldw,
+               dm_bchxylp.ylzl,
+               dm_bchxylp.bz,
+               dm_bchxylp.zdr,
+               dm_bchxylp.zdrq,
+               dm_bchxylp.ylzd1,
+               dm_bchxylp.ylzd2,
+               dm_bchxylp.ylzd3,
+               dm_bchxylp.ylzd4,
+               dm_bchxylp.ylzd5,
+               dm_bchxylp.ylzd6,
+               dm_bchxylp.kwh,
+               dm_bchxylp.rkrq,
+               dm_bchxylp.bgr,
+               dm_bchxylp.rkph,
+               dm_bchxylp.rkbs,
+               dm_bchxylp.dc_ch,
+               dm_bchxylp.dc_pl,
+               dm_bchxylp.dc_zl,
+               dm_bchxylp.sfyl,
+               dm_bchxylp.ylgg,
+               dm_bchxylp.sl,
+               dm_bchxylp.xcmc ,
+               dm_bchxylp.xccd ,
+               dm_bchxylp.ZZCJ,
+               dm_bchxylp.ylcd
+        FROM dm_bchxylp  where  1=1
+        <if test=" dcpl!=null and dcpl!=''">
+            and   dm_bchxylp.dc_pl=#{dcpl}
+        </if>
+        <if test=" dcch!=null and dcch!=''">
+            and   dm_bchxylp.DC_CH=#{dcch}
+        </if>
+        <if test=" dczl!=null and dczl!=''">
+            and   dm_bchxylp.DC_ZL=#{dczl}
+        </if>
+        <if test=" zzcj!=null and zzcj!=''">
+            and   dm_bchxylp.zzcj=#{zzcj}
+        </if>
+
+        <if test=" hxfl!=null and hxfl!=''">
+            and   dm_bchxylp.HXFL=#{hxfl}
+        </if>
+    </select>
+
+</mapper>

src/main/resources/mappers/jcsj/DmBclqjbpMapper.xml

@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.dsic.gj_erp.mapper.jcsj.DmBclqjbpMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.dsic.gj_erp.bean.jcsj.DmBclqjbp">
+        <id column="LQBH" property="lqbh" />
+        <result column="DC_ZL" property="dcZl" />
+        <result column="DC_CH" property="dcCh" />
+        <result column="DC_CM" property="dcCm" />
+        <result column="DC_FD" property="dcFd" />
+        <result column="DELX" property="delx" />
+        <result column="XMBH" property="xmbh" />
+        <result column="YBZS" property="ybzs" />
+        <result column="jsms" property="jsms" />
+        <result column="shms" property="shms" />
+        <result column="SHZL" property="shzl" />
+        <result column="XL" property="xl" />
+        <result column="DC_PL" property="dcPl" />
+        <result column="ZDRQ" property="zdrq" />
+        <result column="ZXDW" property="zxdw" />
+        <result column="YLZD6" property="ylzd6" />
+        <result column="LQMJ" property="lqmj" />
+        <result column="YLZD3" property="ylzd3" />
+        <result column="LJZL" property="ljzl" />
+        <result column="YLZL" property="ylzl" />
+        <result column="DERQ" property="derq" />
+        <result column="YLZD4" property="ylzd4" />
+        <result column="ZZCJ" property="zzcj" />
+        <result column="TZBH" property="tzbh" />
+        <result column="YLZD1" property="ylzd1" />
+        <result column="BZ" property="bz" />
+        <result column="LQZL" property="lqzl" />
+        <result column="YLZD2" property="ylzd2" />
+        <result column="LQLB" property="lqlb" />
+        <result column="ZDR" property="zdr" />
+        <result column="QPYLD" property="qpyld" />
+        <result column="YLZD5" property="ylzd5" />
+        <result column="CJDQ" property="cjdq" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        DC_ZL, DC_CH, DC_CM, DC_FD, DELX, XMBH, YBZS, jsms, shms, SHZL, XL, DC_PL, ZDRQ, ZXDW, YLZD6, LQMJ, YLZD3, LJZL, YLZL, DERQ, YLZD4, ZZCJ, TZBH, YLZD1, LQBH, BZ, LQZL, YLZD2, LQLB, ZDR, QPYLD, YLZD5, CJDQ
+    </sql>
+
+</mapper>

src/main/resources/mappers/jcsj/DmBclqmxpMapper.xml

@@ -0,0 +1,127 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.dsic.gj_erp.mapper.jcsj.DmBclqmxpMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.dsic.gj_erp.bean.jcsj.DmBclqmxp">
+        <id column="XH" property="xh" />
+        <result column="WPH" property="wph" />
+        <result column="WPXH" property="wpxh" />
+        <result column="WPGG" property="wpgg" />
+        <result column="SL" property="sl" />
+        <result column="LQZL" property="lqzl" />
+        <result column="SHZL" property="shzl" />
+        <result column="YLZL" property="ylzl" />
+        <result column="QPYLD" property="qpyld" />
+        <result column="YLZD11" property="ylzd11" />
+        <result column="lqms" property="lqms" />
+        <result column="shms" property="shms" />
+        <result column="WPMC" property="wpmc" />
+        <result column="LJZL" property="ljzl" />
+        <result column="qgrq" property="qgrq" />
+        <result column="qgsl" property="qgsl" />
+        <result column="LQLB_z" property="lqlbZ" />
+        <result column="DC_PL_z" property="dcPlZ" />
+        <result column="DC_ZL_z" property="dcZlZ" />
+        <result column="DC_CH_z" property="dcChZ" />
+        <result column="DC_CM_z" property="dcCmZ" />
+        <result column="DC_FD_z" property="dcFdZ" />
+        <result column="DELX_z" property="delxZ" />
+        <result column="DERQ_z" property="derqZ" />
+        <result column="XMBH_z" property="xmbhZ" />
+        <result column="YBZS_z" property="ybzsZ" />
+        <result column="LQZL_z" property="lqzlZ" />
+        <result column="SHZL_z" property="shzlZ" />
+        <result column="YLZL_z" property="ylzlZ" />
+        <result column="QPYLD_z" property="qpyldZ" />
+        <result column="ZXDW_z" property="zxdwZ" />
+        <result column="LQMJ_z" property="lqmjZ" />
+        <result column="CJDQ_z" property="cjdqZ" />
+        <result column="XL_z" property="xlZ" />
+        <result column="ZDR_z" property="zdrZ" />
+        <result column="ZDRQ_z" property="zdrqZ" />
+        <result column="JSMS_z" property="jsmsZ" />
+        <result column="SHMS_z" property="shmsZ" />
+        <result column="LJZL_z" property="ljzlZ" />
+        <result column="ZZCJ_z" property="zzcjZ" />
+        <result column="drcs" property="drcs" />
+        <result column="YLZD12" property="ylzd12" />
+        <result column="XGRQ" property="xgrq" />
+        <result column="BZ_z" property="bzZ" />
+        <result column="YLZD9" property="ylzd9" />
+        <result column="YLZD10" property="ylzd10" />
+        <result column="BZ" property="bz" />
+        <result column="YLZD7" property="ylzd7" />
+        <result column="XGR" property="xgr" />
+        <result column="YLZD8" property="ylzd8" />
+        <result column="sysl" property="sysl" />
+        <result column="LQBH" property="lqbh" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        XH, WPH, WPXH, WPGG, SL, LQZL, SHZL, YLZL, QPYLD, YLZD11, lqms, shms, WPMC, LJZL, qgrq, qgsl, LQLB_z, DC_PL_z, DC_ZL_z, DC_CH_z, DC_CM_z, DC_FD_z, DELX_z, DERQ_z, XMBH_z, YBZS_z, LQZL_z, SHZL_z, YLZL_z, QPYLD_z, ZXDW_z, LQMJ_z, CJDQ_z, XL_z, ZDR_z, ZDRQ_z, JSMS_z, SHMS_z, LJZL_z, ZZCJ_z, drcs, YLZD12, XGRQ, BZ_z, YLZD9, YLZD10, BZ, YLZD7, XGR, YLZD8, sysl, LQBH
+    </sql>
+
+    <select id="getBcLQlList" parameterType="map" resultType="com.dsic.gj_erp.bean.jcsj.DmBclqmxp">
+        SELECT DM_BCLQMXP.LQBH,
+               DM_BCLQMXP.XH,
+               DM_BCLQMXP.WPH,
+               DM_BCLQMXP.WPXH,
+               DM_BCLQMXP.WPGG,
+               isnull(DM_BCLQMXP.SL,0) as SL ,
+               isnull(DM_BCLQMXP.LQZL,0) as LQZL,
+                isnull( DM_BCLQMXP.SHZL,0) as shzl,
+               DM_BCLQMXP.YLZL,
+               DM_BCLQMXP.QPYLD,
+               DM_BCLQMXP.wpmc,
+        isnull( DM_BCLQMXP.ljzl,0) as ljzl,
+               DM_BCLQMXP.BZ,
+               DM_BCLQMXP.XGR,
+               DM_BCLQMXP.XGRQ,
+               DM_BCLQMXP.lqms,
+               DM_BCLQMXP.shms,
+               DM_BCLQMXP.ylzd11,
+               DM_BCLQMXP.zdr_z as zdrZ,
+               DM_BCLQMXP.zdrq_z AS zdrqZ,
+               DM_WPJBP.WPMC,
+               RTRIM(DM_BCLQJBP.zzcj) AS zzcjZ,
+               RTRIM(DM_BCLQJBP.LQLB) AS lqLbZ,
+               RTRIM(DM_BCLQJBP.DC_PL) AS dcPlZ,
+               RTRIM(DM_BCLQJBP.DC_ZL) AS dcZlZ,
+               RTRIM(DM_BCLQJBP.DC_CH) AS dcChZ,
+               RTRIM(DM_BCLQJBP.DC_CM) AS dcCmZ,
+               RTRIM(DM_BCLQJBP.DC_FD) AS dcFdZ,
+
+
+
+                DM_BCLQJBP.qpyld as qpyldZ,
+                DM_BCLQJBP.ljzl as ljzlZ,
+                DM_BCLQJBP.ybzs as ybzsZ,
+                DM_BCLQJBP.lqzl as lqzlZ,
+                DM_BCLQJBP.shzl as shzlZ,
+                DM_BCLQJBP.ylzl as ylzlZ
+        FROM DM_BCLQMXP,DM_WPJBP,DM_BCLQJBP
+        WHERE DM_BCLQMXP.WPH *= DM_WPJBP.WPH
+     AND DM_BCLQMXP.LQBH = DM_BCLQJBP.LQBH
+        <if test=" dcpl!=null and dcpl!=''">
+          and   DM_BCLQJBP.dc_pl=#{dcpl}
+        </if>
+        <if test=" dcch!=null and dcch!=''">
+            and   DM_BCLQJBP.DC_CH=#{dcch}
+        </if>
+        <if test=" dczl!=null and dczl!=''">
+            and   DM_BCLQJBP.DC_ZL=#{dczl}
+        </if>
+        <if test=" zzcj!=null and zzcj!=''">
+            and   DM_BCLQJBP.zzcj=#{zzcj}
+        </if>
+
+
+        <if test=" delx!=null and delx!=''">
+            and   DM_BCLQJBP.DELX=#{delx}
+        </if>
+        order by  DM_BCLQJBP.dc_ch,DM_BCLQJBP.dc_pl,DM_BCLQJBP.dc_zl,DM_BCLQJBP.lqlb,DM_BCLQJBP.zzcj
+    </select>
+
+</mapper>

src/main/resources/mappers/jcsj/DmBomMapper.xml

@@ -0,0 +1,185 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.dsic.gj_erp.mapper.jcsj.DmBomMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.dsic.gj_erp.bean.jcsj.DmBom">
+        <result property="pid" column="pid" jdbcType="INTEGER"/>
+        <result property="dcch" column="dcch" jdbcType="VARCHAR"/>
+        <result property="mbch" column="mbch" jdbcType="VARCHAR"/>
+        <result property="sjch" column="sjch" jdbcType="VARCHAR"/>
+        <result property="pl" column="pl" jdbcType="VARCHAR"/>
+        <result property="fd" column="fd" jdbcType="VARCHAR"/>
+        <result property="xqdd" column="xqdd" jdbcType="VARCHAR"/>
+        <result property="pw" column="pw" jdbcType="VARCHAR"/>
+        <result property="lqlb" column="lqlb" jdbcType="VARCHAR"/>
+        <result property="kw" column="kw" jdbcType="VARCHAR"/>
+        <result property="sbbh" column="sbbh" jdbcType="VARCHAR"/>
+        <result property="sclx" column="sclx" jdbcType="VARCHAR"/>
+        <result property="zl" column="zl" jdbcType="VARCHAR"/>
+        <result property="wpcz" column="wpcz" jdbcType="VARCHAR"/>
+        <result property="wpgg" column="wpgg" jdbcType="VARCHAR"/>
+        <result property="bh" column="bh" jdbcType="DECIMAL"/>
+        <result property="bc" column="bc" jdbcType="DECIMAL"/>
+        <result property="yqyl" column="yqyl" jdbcType="DECIMAL"/>
+        <result property="qgcd" column="qgcd" jdbcType="DECIMAL"/>
+        <result property="tzbh" column="tzbh" jdbcType="VARCHAR"/>
+        <result property="tlsl" column="tlsl" jdbcType="DECIMAL"/>
+        <result property="pklx" column="pklx" jdbcType="VARCHAR"/>
+        <result property="qbs" column="qbs" jdbcType="VARCHAR"/>
+        <result property="pkbs" column="pkbs" jdbcType="VARCHAR"/>
+        <result property="pkcd" column="pkcd" jdbcType="DECIMAL"/>
+        <result property="dmbs" column="dmbs" jdbcType="VARCHAR"/>
+        <result property="dmcd" column="dmcd" jdbcType="DECIMAL"/>
+        <result property="zpsx" column="zpsx" jdbcType="INTEGER"/>
+        <result property="ljbh" column="ljbh" jdbcType="VARCHAR"/>
+        <result property="ljsl" column="ljsl" jdbcType="DECIMAL"/>
+        <result property="ljsx" column="ljsx" jdbcType="VARCHAR"/>
+        <result property="djmj" column="djmj" jdbcType="DECIMAL"/>
+        <result property="ljdz" column="ljdz" jdbcType="DECIMAL"/>
+        <result property="blgs" column="blgs" jdbcType="DECIMAL"/>
+        <result property="pwgs" column="pwgs" jdbcType="DECIMAL"/>
+        <result property="llgs" column="llgs" jdbcType="DECIMAL"/>
+        <result property="hxgs" column="hxgs" jdbcType="DECIMAL"/>
+        <result property="qggs" column="qggs" jdbcType="DECIMAL"/>
+        <result property="pkgs" column="pkgs" jdbcType="DECIMAL"/>
+        <result property="qgs" column="qgs" jdbcType="DECIMAL"/>
+        <result property="dmgs" column="dmgs" jdbcType="DECIMAL"/>
+        <result property="zpgs" column="zpgs" jdbcType="DECIMAL"/>
+        <result property="fkblgs" column="fkblgs" jdbcType="DECIMAL"/>
+        <result property="fkpwgs" column="fkpwgs" jdbcType="DECIMAL"/>
+        <result property="fkllgs" column="fkllgs" jdbcType="DECIMAL"/>
+        <result property="fkhxgs" column="fkhxgs" jdbcType="DECIMAL"/>
+        <result property="fkqggs" column="fkqggs" jdbcType="DECIMAL"/>
+        <result property="fkpkgs" column="fkpkgs" jdbcType="DECIMAL"/>
+        <result property="fkqgs" column="fkqgs" jdbcType="DECIMAL"/>
+        <result property="fkdmgs" column="fkdmgs" jdbcType="DECIMAL"/>
+        <result property="fkzpgs" column="fkzpgs" jdbcType="DECIMAL"/>
+        <result property="type" column="type" jdbcType="VARCHAR"/>
+        <result property="id" column="ID" jdbcType="INTEGER"/>
+        <result property="fds" column="fds" jdbcType="VARCHAR"/>
+        <result property="hxcd" column="hxcd" jdbcType="DECIMAL"/>
+        <result property="lqbs" column="lqbs" jdbcType="VARCHAR"/>
+        <result property="tjbs" column="tjBs" jdbcType="VARCHAR"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+                pid,dcch,mbch,
+                sjch,pl,fd,
+                xqdd,pw,lqlb,
+                kw,sbbh,sclx,
+                zl,wpcz,wpgg,
+                bh,bc,yqyl,
+                qgcd,tzbh,tlsl,
+                pklx,qbs,pkbs,
+                pkcd,dmbs,dmcd,
+                zpsx,ljbh,ljsl,
+                ljsx,djmj,ljdz,
+                blgs,pwgs,llgs,
+                hxgs,qggs,pkgs,
+                qgs,dmgs,zpgs,
+                fkblgs,fkpwgs,fkllgs,
+                fkhxgs,fkqggs,fkpkgs,
+                fkqgs,fkdmgs,fkzpgs,
+                type,ID,fds,
+                hxcd,lqbs,tjBs
+    </sql>
+
+    <insert id="insertBoms" parameterType="java.util.List">
+        insert into dm_bom
+        ( pid,dcch,mbch
+        ,sjch,pl,fd
+        ,xqdd,pw,lqlb
+        ,kw,sbbh,sclx
+        ,zl,wpcz,wpgg
+        ,bh,bc,yqyl
+        ,qgcd,tzbh,tlsl
+        ,pklx,qbs,pkbs
+        ,pkcd,dmbs,dmcd
+        ,zpsx,ljbh,ljsl
+        ,ljsx,djmj,ljdz
+        ,blgs,pwgs,llgs
+        ,hxgs,qggs,pkgs
+        ,qgs,dmgs,zpgs
+        ,fkblgs,fkpwgs,fkllgs
+        ,fkhxgs,fkqggs,fkpkgs
+        ,fkqgs,fkdmgs,fkzpgs
+        ,type,fds
+        ,hxcd,lqbs,tjBs
+        )
+        <foreach collection="list" index="index" item="item" separator=",">
+            values (#{item.pid,jdbcType=INTEGER},#{item.dcch,jdbcType=VARCHAR},#{item.mbch,jdbcType=VARCHAR}
+            ,#{item.sjch,jdbcType=VARCHAR},#{item.pl,jdbcType=VARCHAR},#{item.fd,jdbcType=VARCHAR}
+            ,#{item.xqdd,jdbcType=VARCHAR},#{item.pw,jdbcType=VARCHAR},#{item.lqlb,jdbcType=VARCHAR}
+            ,#{item.kw,jdbcType=VARCHAR},#{item.sbbh,jdbcType=VARCHAR},#{item.sclx,jdbcType=VARCHAR}
+            ,#{item.zl,jdbcType=VARCHAR},#{item.wpcz,jdbcType=VARCHAR},#{item.wpgg,jdbcType=VARCHAR}
+            ,#{item.bh,jdbcType=DECIMAL},#{item.bc,jdbcType=DECIMAL},#{item.yqyl,jdbcType=DECIMAL}
+            ,#{item.qgcd,jdbcType=DECIMAL},#{item.tzbh,jdbcType=VARCHAR},#{item.tlsl,jdbcType=DECIMAL}
+            ,#{item.pklx,jdbcType=VARCHAR},#{item.qbs,jdbcType=VARCHAR},#{item.pkbs,jdbcType=VARCHAR}
+            ,#{item.pkcd,jdbcType=DECIMAL},#{item.dmbs,jdbcType=VARCHAR},#{item.dmcd,jdbcType=DECIMAL}
+            ,#{item.zpsx,jdbcType=INTEGER},#{item.ljbh,jdbcType=VARCHAR},#{item.ljsl,jdbcType=DECIMAL}
+            ,#{item.ljsx,jdbcType=VARCHAR},#{item.djmj,jdbcType=DECIMAL},#{item.ljdz,jdbcType=DECIMAL}
+            ,#{item.blgs,jdbcType=DECIMAL},#{item.pwgs,jdbcType=DECIMAL},#{item.llgs,jdbcType=DECIMAL}
+            ,#{item.hxgs,jdbcType=DECIMAL},#{item.qggs,jdbcType=DECIMAL},#{item.pkgs,jdbcType=DECIMAL}
+            ,#{item.qgs,jdbcType=DECIMAL},#{item.dmgs,jdbcType=DECIMAL},#{item.zpgs,jdbcType=DECIMAL}
+            ,#{item.fkblgs,jdbcType=DECIMAL},#{item.fkpwgs,jdbcType=DECIMAL},#{item.fkllgs,jdbcType=DECIMAL}
+            ,#{item.fkhxgs,jdbcType=DECIMAL},#{item.fkqggs,jdbcType=DECIMAL},#{item.fkpkgs,jdbcType=DECIMAL}
+            ,#{item.fkqgs,jdbcType=DECIMAL},#{item.fkdmgs,jdbcType=DECIMAL},#{item.fkzpgs,jdbcType=DECIMAL}
+            ,#{item.type,jdbcType=VARCHAR},#{item.fds,jdbcType=VARCHAR}
+            ,#{item.hxcd,jdbcType=DECIMAL},#{item.lqbs,jdbcType=VARCHAR},#{item.tjbs,jdbcType=VARCHAR}
+            )
+        </foreach>
+    </insert>
+
+
+  
+    <insert id="insertBom" parameterType="com.dsic.gj_erp.bean.jcsj.DmBom">
+        insert into dm_bom
+        ( pid,dcch,mbch
+        ,sjch,pl,fd
+        ,xqdd,pw,lqlb
+        ,kw,sbbh,sclx
+        ,zl,wpcz,wpgg
+        ,bh,bc,yqyl
+        ,qgcd,tzbh,tlsl
+        ,pklx,qbs,pkbs
+        ,pkcd,dmbs,dmcd
+        ,zpsx,ljbh,ljsl
+        ,ljsx,djmj,ljdz
+        ,blgs,pwgs,llgs
+        ,hxgs,qggs,pkgs
+        ,qgs,dmgs,zpgs
+        ,fkblgs,fkpwgs,fkllgs
+        ,fkhxgs,fkqggs,fkpkgs
+        ,fkqgs,fkdmgs,fkzpgs
+        ,type,fds
+        ,hxcd,lqbs,tjBs
+        )
+
+            values (#{pid,jdbcType=INTEGER},#{dcch,jdbcType=VARCHAR},#{mbch,jdbcType=VARCHAR}
+            ,#{sjch,jdbcType=VARCHAR},#{pl,jdbcType=VARCHAR},#{fd,jdbcType=VARCHAR}
+            ,#{xqdd,jdbcType=VARCHAR},#{pw,jdbcType=VARCHAR},#{lqlb,jdbcType=VARCHAR}
+            ,#{kw,jdbcType=VARCHAR},#{sbbh,jdbcType=VARCHAR},#{sclx,jdbcType=VARCHAR}
+            ,#{zl,jdbcType=VARCHAR},#{wpcz,jdbcType=VARCHAR},#{wpgg,jdbcType=VARCHAR}
+            ,#{bh,jdbcType=DECIMAL},#{bc,jdbcType=DECIMAL},#{yqyl,jdbcType=DECIMAL}
+            ,#{qgcd,jdbcType=DECIMAL},#{tzbh,jdbcType=VARCHAR},#{tlsl,jdbcType=DECIMAL}
+            ,#{pklx,jdbcType=VARCHAR},#{qbs,jdbcType=VARCHAR},#{pkbs,jdbcType=VARCHAR}
+            ,#{pkcd,jdbcType=DECIMAL},#{dmbs,jdbcType=VARCHAR},#{dmcd,jdbcType=DECIMAL}
+            ,#{zpsx,jdbcType=INTEGER},#{ljbh,jdbcType=VARCHAR},#{ljsl,jdbcType=DECIMAL}
+            ,#{ljsx,jdbcType=VARCHAR},#{djmj,jdbcType=DECIMAL},#{ljdz,jdbcType=DECIMAL}
+            ,#{blgs,jdbcType=DECIMAL},#{pwgs,jdbcType=DECIMAL},#{llgs,jdbcType=DECIMAL}
+            ,#{hxgs,jdbcType=DECIMAL},#{qggs,jdbcType=DECIMAL},#{pkgs,jdbcType=DECIMAL}
+            ,#{qgs,jdbcType=DECIMAL},#{dmgs,jdbcType=DECIMAL},#{zpgs,jdbcType=DECIMAL}
+            ,#{fkblgs,jdbcType=DECIMAL},#{fkpwgs,jdbcType=DECIMAL},#{fkllgs,jdbcType=DECIMAL}
+            ,#{fkhxgs,jdbcType=DECIMAL},#{fkqggs,jdbcType=DECIMAL},#{fkpkgs,jdbcType=DECIMAL}
+            ,#{fkqgs,jdbcType=DECIMAL},#{fkdmgs,jdbcType=DECIMAL},#{fkzpgs,jdbcType=DECIMAL}
+            ,#{type,jdbcType=VARCHAR},#{fds,jdbcType=VARCHAR}
+            ,#{hxcd,jdbcType=DECIMAL},#{lqbs,jdbcType=VARCHAR},#{tjbs,jdbcType=VARCHAR}
+            )
+
+    </insert>
+
+
+
+
+</mapper>

src/main/resources/mappers/jcsj/DmWlqdMapper.xml

@@ -0,0 +1,136 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.dsic.gj_erp.mapper.jcsj.DmWlqdMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.dsic.gj_erp.bean.jcsj.DmWlqd">
+        <id column="XWH" property="xwh" />
+        <result column="WPJB" property="wpjb" />
+        <result column="WPFLM" property="wpflm" />
+        <result column="ZDRY" property="zdry" />
+        <result column="XGRQ" property="xgrq" />
+        <result column="DC_CH" property="dcCh" />
+        <result column="DC_CM" property="dcCm" />
+        <result column="DC_PL" property="dcPl" />
+        <result column="DC_FD" property="dcFd" />
+        <result column="DC_TH" property="dcTh" />
+        <result column="DC_ZL" property="dcZl" />
+        <result column="DC_TZ" property="dcTz" />
+        <result column="DC_YJ" property="dcYj" />
+        <result column="DC_YS" property="dcYs" />
+        <result column="DC_PB" property="dcPb" />
+        <result column="DC_LPH" property="dcLph" />
+        <result column="DC_TPBH" property="dcTpbh" />
+        <result column="DC_TPMC" property="dcTpmc" />
+        <result column="JLDW1" property="jldw1" />
+        <result column="WPMC" property="wpmc" />
+        <result column="WPGG" property="wpgg" />
+        <result column="WPXH" property="wpxh" />
+        <result column="ABCLX" property="abclx" />
+        <result column="GZLX" property="gzlx" />
+        <result column="YLZD1" property="ylzd1" />
+        <result column="LCM1" property="lcm1" />
+        <result column="zt" property="zt" />
+        <result column="YLZD2" property="ylzd2" />
+        <result column="YLZD8" property="ylzd8" />
+        <result column="DEZL" property="dezl" />
+        <result column="LCM5" property="lcm5" />
+        <result column="XNJBS" property="xnjbs" />
+        <result column="SL" property="sl" />
+        <result column="YLZD5" property="ylzd5" />
+        <result column="YXZZRQ" property="yxzzrq" />
+        <result column="LCM2" property="lcm2" />
+        <result column="JLDW" property="jldw" />
+        <result column="YLZD6" property="ylzd6" />
+        <result column="GYSBH" property="gysbh" />
+        <result column="TQQXZL" property="tqqxzl" />
+        <result column="YLZD3" property="ylzd3" />
+        <result column="BZ" property="bz" />
+        <result column="YLZD9" property="ylzd9" />
+        <result column="YLZD4" property="ylzd4" />
+        <result column="ZXWPH" property="zxwph" />
+        <result column="GYLB" property="gylb" />
+        <result column="YXQSRQ" property="yxqsrq" />
+        <result column="DRRY" property="drry" />
+        <result column="LCM3" property="lcm3" />
+        <result column="YHFLH" property="yhflh" />
+        <result column="WPH" property="wph" />
+        <result column="XLCC" property="xlcc" />
+        <result column="FXWPH" property="fxwph" />
+        <result column="WPCC" property="wpcc" />
+        <result column="JZL" property="jzl" />
+        <result column="FWPJB" property="fwpjb" />
+        <result column="YLZD7" property="ylzd7" />
+        <result column="SJBCSL" property="sjbcsl" />
+        <result column="DRRQ" property="drrq" />
+        <result column="LCM4" property="lcm4" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        WPJB, WPFLM, ZDRY, XGRQ, DC_CH, DC_CM, DC_PL, DC_FD, DC_TH, DC_ZL, DC_TZ, DC_YJ, DC_YS, DC_PB, DC_LPH, DC_TPBH, DC_TPMC, JLDW1, WPMC, WPGG, WPXH, ABCLX, GZLX, YLZD1, LCM1, zt, YLZD2, YLZD8, DEZL, LCM5, XNJBS, SL, YLZD5, YXZZRQ, LCM2, JLDW, YLZD6, GYSBH, TQQXZL, YLZD3, XWH, BZ, YLZD9, YLZD4, ZXWPH, GYLB, YXQSRQ, DRRY, LCM3, YHFLH, WPH, XLCC, FXWPH, WPCC, JZL, FWPJB, YLZD7, SJBCSL, DRRQ, LCM4
+    </sql>
+
+    <select id="getLJQDList" resultType="com.dsic.gj_erp.bean.jcsj.DmWlqd">
+        SELECT  RTRIM(DM_WLQD.FXWPH) AS FXWPH ,
+                DM_WLQD.XWH AS XWH ,
+                RTRIM(DM_WLQD.ZXWPH)  AS ZXWPH ,
+                DM_WLQD.SL,
+                DM_WLQD.jzl,
+                RTRIM(DM_WLQD.JLDW) AS JLDW ,
+                RTRIM(DM_WLQD.XNJBS) AS XNJBS ,
+                RTRIM(DM_WLQD.WPJB) AS  WPJB ,
+                RTRIM(DM_WLQD.FWPJB) AS FWPJB ,
+                RTRIM(DM_WLQD.YHFLH) AS YHFLH ,
+                RTRIM(DM_WLQD.WPFLM) AS WPFLM,
+                RTRIM(DM_WLQD.ZDRY) AS ZDRY,
+                RTRIM(DM_WLQD.WPH) AS WPH,
+                RTRIM(DM_WLQD.WPMC) AS WPMC,
+                RTRIM(DM_WLQD.WPGG) AS WPGG,
+                RTRIM(DM_WLQD.WPXH) AS WPXH,
+                RTRIM(DM_WLQD.XGRQ) AS XGRQ,
+                RTRIM(DM_WLQD.WPCC) AS XLCC,
+                RTRIM(DM_WLQD.DC_CH) AS DC_CH,
+                RTRIM(DM_WLQD.DC_CM) AS DC_CM,
+                RTRIM(DM_WLQD.DC_FD) AS DC_FD,
+                RTRIM(DM_WLQD.DC_TH) AS DC_TH,
+                RTRIM(DM_WLQD.DC_ZL) AS DC_ZL,
+                RTRIM(DM_WLQD.DC_TZ) AS DC_TZ,
+                RTRIM(DM_WLQD.DC_YJ) AS DC_YJ,
+                RTRIM(DM_WLQD.DC_YS) AS DC_YS,
+                RTRIM(DM_WLQD.DC_PB) AS DC_PB,
+                RTRIM(DM_WLQD.DC_LPH) AS DC_LPH,
+                RTRIM(DM_WLQD.DC_TPBH) AS DC_TPBH,
+                RTRIM(DM_WLQD.DC_TPMC) AS DC_TPMC,
+                RTRIM(DM_WLQD.BZ) AS BZ,
+                RTRIM(DM_WLQD.ABCLX) AS ABCLX,
+                RTRIM(DM_WLQD.GYLB) AS GYLB,
+                RTRIM(DM_WLQD.GZLX) AS GZLX,
+                RTRIM(DM_WLQD.GYSBH) AS GYSBH,
+                RTRIM(DM_WLQD.YLZD1) AS YLZD1,
+                DM_WLQD.DEZL,
+                RTRIM(DM_WLQD.JLDW1) AS JLDW1,
+                left(ZXWPH,charindex('-',ZXWPH,charindex('-',ZXWPH,1) + 1) - 1 ) AS LCM1,
+                RTRIM(DM_WLQD.LCM2) AS LCM2,
+                RTRIM(DM_WLQD.LCM3) AS LCM3,
+                RTRIM(DM_WLQD.LCM4) AS LCM4,
+                RTRIM(DM_WLQD.LCM5) AS LCM5,
+                DM_WLQD.DC_PL,
+                tt1.TZBH
+        FROM DM_WLQD
+                 left join (select DM_BCHXJBP.dc_ch as dc_ch,DM_BCHXJBP.DC_PL as DC_PL,DM_BCHXJBP.TZBH as TZBH,RTRIM(DM_BCHXMXP.WPH) as wph
+                            FROM DM_BCHXMXP,DM_BCHXJBP
+                            WHERE DM_BCHXMXP.HXBH = DM_BCHXJBP.HXBH AND RTRIM(DM_BCHXJBP.HXFL) = 'B') as tt1
+                           on(tt1.dc_ch = DM_WLQD.DC_CH and tt1.wph = DM_WLQD.wph )
+        where 1=1
+        <if test=" dcpl!=null and dcpl!=''">
+            and   DM_WLQD.dc_pl=#{dcpl}
+        </if>
+        <if test=" dcch!=null and dcch!=''">
+            and   DM_WLQD.DC_CH=#{dcch}
+        </if>
+
+
+    </select>
+
+</mapper>

src/main/resources/mappers/jcsj/DmWpjbpMapper.xml

@@ -0,0 +1,164 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.dsic.gj_erp.mapper.jcsj.DmWpjbpMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.dsic.gj_erp.bean.jcsj.DmWpjbp">
+        <id column="WPH" property="wph" />
+        <result column="DC_CH" property="dcCh" />
+        <result column="DC_CM" property="dcCm" />
+        <result column="DC_PL" property="dcPl" />
+        <result column="DC_FD" property="dcFd" />
+        <result column="DC_TH" property="dcTh" />
+        <result column="DC_ZL" property="dcZl" />
+        <result column="DC_TZ" property="dcTz" />
+        <result column="DC_YJ" property="dcYj" />
+        <result column="DC_YS" property="dcYs" />
+        <result column="DC_PB" property="dcPb" />
+        <result column="DC_LPH" property="dcLph" />
+        <result column="DC_TPBH" property="dcTpbh" />
+        <result column="DC_TPMC" property="dcTpmc" />
+        <result column="ZJBS" property="zjbs" />
+        <result column="WPZS" property="wpzs" />
+        <result column="CPLL_JLDW" property="cpllJldw" />
+        <result column="YHFLH" property="yhflh" />
+        <result column="YXQSSJ" property="yxqssj" />
+        <result column="KJKMBM" property="kjkmbm" />
+        <result column="JSTJ" property="jstj" />
+        <result column="DJGL" property="djgl" />
+        <result column="XGSJCG" property="xgsjcg" />
+        <result column="DJDY_JLDW" property="djdyJldw" />
+        <result column="BPL" property="bpl" />
+        <result column="GJJBS" property="gjjbs" />
+        <result column="WPFLM4" property="wpflm4" />
+        <result column="WPXH" property="wpxh" />
+        <result column="ZTF" property="ztf" />
+        <result column="GYCZY" property="gyczy" />
+        <result column="BSLX" property="bslx" />
+        <result column="JLDW1" property="jldw1" />
+        <result column="PLJS" property="pljs" />
+        <result column="BZJGXGR" property="bzjgxgr" />
+        <result column="FPXS" property="fpxs" />
+        <result column="WPJSTJ" property="wpjstj" />
+        <result column="CPCS" property="cpcs" />
+        <result column="ZDRYQL" property="zdryql" />
+        <result column="ZGZQ" property="zgzq" />
+        <result column="ZDPL" property="zdpl" />
+        <result column="ZL" property="zl" />
+        <result column="ZXBZH" property="zxbzh" />
+        <result column="JLCD" property="jlcd" />
+        <result column="JGCZY" property="jgczy" />
+        <result column="YLZD2" property="ylzd2" />
+        <result column="CCXGR" property="ccxgr" />
+        <result column="XGSJ" property="xgsj" />
+        <result column="CGJLDW" property="cgjldw" />
+        <result column="DEZL" property="dezl" />
+        <result column="BZJGXGRQ" property="bzjgxgrq" />
+        <result column="DWHSL" property="dwhsl" />
+        <result column="FJBS" property="fjbs" />
+        <result column="XGSJQL" property="xgsjql" />
+        <result column="FDGZQ" property="fdgzq" />
+        <result column="ZDRYTQ" property="zdrytq" />
+        <result column="YLZD5" property="ylzd5" />
+        <result column="JYC" property="jyc" />
+        <result column="WPFLM2" property="wpflm2" />
+        <result column="ZLBZH" property="zlbzh" />
+        <result column="WPFLM" property="wpflm" />
+        <result column="TQQXGBS" property="tqqxgbs" />
+        <result column="GYWCBS" property="gywcbs" />
+        <result column="XNJBS" property="xnjbs" />
+        <result column="DHKC" property="dhkc" />
+        <result column="WPFLM5" property="wpflm5" />
+        <result column="DWJGXGR" property="dwjgxgr" />
+        <result column="SPBM" property="spbm" />
+        <result column="DFKMBM" property="dfkmbm" />
+        <result column="YXZZSJ" property="yxzzsj" />
+        <result column="CPTY" property="cpty" />
+        <result column="JZMD" property="jzmd" />
+        <result column="GSDEM" property="gsdem" />
+        <result column="YXYC" property="yxyc" />
+        <result column="BZJG" property="bzjg" />
+        <result column="RKBS" property="rkbs" />
+        <result column="ZXPL" property="zxpl" />
+        <result column="JGBZ" property="jgbz" />
+        <result column="JGWCBS" property="jgwcbs" />
+        <result column="YLZD8" property="ylzd8" />
+        <result column="ABCLX" property="abclx" />
+        <result column="DRJG" property="drjg" />
+        <result column="ZDRY" property="zdry" />
+        <result column="FGSJ" property="fgsj" />
+        <result column="GZLX" property="gzlx" />
+        <result column="AQDM" property="aqdm" />
+        <result column="DWJGXGRQ" property="dwjgxgrq" />
+        <result column="CGBZ" property="cgbz" />
+        <result column="WPTPDZ" property="wptpdz" />
+        <result column="CPCS_JLDW" property="cpcsJldw" />
+        <result column="ZJM" property="zjm" />
+        <result column="BSBM" property="bsbm" />
+        <result column="BZ" property="bz" />
+        <result column="XHZL" property="xhzl" />
+        <result column="WPMC" property="wpmc" />
+        <result column="CCXGRQ" property="ccxgrq" />
+        <result column="YLZD3" property="ylzd3" />
+        <result column="YLZD9" property="ylzd9" />
+        <result column="CKH" property="ckh" />
+        <result column="YLL" property="yll" />
+        <result column="XJBS" property="xjbs" />
+        <result column="DBZ" property="dbz" />
+        <result column="WPGL" property="wpgl" />
+        <result column="AQKC" property="aqkc" />
+        <result column="GYLX" property="gylx" />
+        <result column="GYLB" property="gylb" />
+        <result column="BZPL" property="bzpl" />
+        <result column="WPCC" property="wpcc" />
+        <result column="DJGL_JLDW" property="djglJldw" />
+        <result column="JZ" property="jz" />
+        <result column="PLDM" property="pldm" />
+        <result column="DWJG" property="dwjg" />
+        <result column="WPFLM3" property="wpflm3" />
+        <result column="WPGG" property="wpgg" />
+        <result column="GYCZRQ" property="gyczrq" />
+        <result column="YLZD6" property="ylzd6" />
+        <result column="ZZBM" property="zzbm" />
+        <result column="ZDKC" property="zdkc" />
+        <result column="DCM" property="dcm" />
+        <result column="WPEMC" property="wpemc" />
+        <result column="GYSBH" property="gysbh" />
+        <result column="PHXS" property="phxs" />
+        <result column="WPZL" property="wpzl" />
+        <result column="CPTY_JLDW" property="cptyJldw" />
+        <result column="WD" property="wd" />
+        <result column="DJDY" property="djdy" />
+        <result column="JGCZRQ" property="jgczrq" />
+        <result column="YCZJL" property="yczjl" />
+        <result column="JGWCRQ" property="jgwcrq" />
+        <result column="CFLAG" property="cflag" />
+        <result column="CLDH" property="cldh" />
+        <result column="YLZD1" property="ylzd1" />
+        <result column="YLZD7" property="ylzd7" />
+        <result column="ZDSJ" property="zdsj" />
+        <result column="GDPL" property="gdpl" />
+        <result column="TZGG" property="tzgg" />
+        <result column="CPLL" property="cpll" />
+        <result column="CCBS" property="ccbs" />
+        <result column="AQQ" property="aqq" />
+        <result column="JYBZ" property="jybz" />
+        <result column="BZXX" property="bzxx" />
+        <result column="KCJBS" property="kcjbs" />
+        <result column="CPXL" property="cpxl" />
+        <result column="ZDRYCG" property="zdrycg" />
+        <result column="XGSJTQ" property="xgsjtq" />
+        <result column="XSJG" property="xsjg" />
+        <result column="JLDW" property="jldw" />
+        <result column="WPJB" property="wpjb" />
+        <result column="GYWCRQ" property="gywcrq" />
+        <result column="ZTQQXGBS" property="ztqqxgbs" />
+        <result column="YLZD4" property="ylzd4" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        DC_CH, DC_CM, DC_PL, DC_FD, DC_TH, DC_ZL, DC_TZ, DC_YJ, DC_YS, DC_PB, DC_LPH, DC_TPBH, DC_TPMC, ZJBS, WPZS, CPLL_JLDW, YHFLH, WPH, YXQSSJ, KJKMBM, JSTJ, DJGL, XGSJCG, DJDY_JLDW, BPL, GJJBS, WPFLM4, WPXH, ZTF, GYCZY, BSLX, JLDW1, PLJS, BZJGXGR, FPXS, WPJSTJ, CPCS, ZDRYQL, ZGZQ, ZDPL, ZL, ZXBZH, JLCD, JGCZY, YLZD2, CCXGR, XGSJ, CGJLDW, DEZL, BZJGXGRQ, DWHSL, FJBS, XGSJQL, FDGZQ, ZDRYTQ, YLZD5, JYC, WPFLM2, ZLBZH, WPFLM, TQQXGBS, GYWCBS, XNJBS, DHKC, WPFLM5, DWJGXGR, SPBM, DFKMBM, YXZZSJ, CPTY, JZMD, GSDEM, YXYC, BZJG, RKBS, ZXPL, JGBZ, JGWCBS, YLZD8, ABCLX, DRJG, ZDRY, FGSJ, GZLX, AQDM, DWJGXGRQ, CGBZ, WPTPDZ, CPCS_JLDW, ZJM, BSBM, BZ, XHZL, WPMC, CCXGRQ, YLZD3, YLZD9, CKH, YLL, XJBS, DBZ, WPGL, AQKC, GYLX, GYLB, BZPL, WPCC, DJGL_JLDW, JZ, PLDM, DWJG, WPFLM3, WPGG, GYCZRQ, YLZD6, ZZBM, ZDKC, DCM, WPEMC, GYSBH, PHXS, WPZL, CPTY_JLDW, WD, DJDY, JGCZRQ, YCZJL, JGWCRQ, CFLAG, CLDH, YLZD1, YLZD7, ZDSJ, GDPL, TZGG, CPLL, CCBS, AQQ, JYBZ, BZXX, KCJBS, CPXL, ZDRYCG, XGSJTQ, XSJG, JLDW, WPJB, GYWCRQ, ZTQQXGBS, YLZD4
+    </sql>
+
+</mapper>