From 09407e3d5e5d1a9d8a93d5bc063a353194d13d86 Mon Sep 17 00:00:00 2001 From: xhj Date: Wed, 27 Sep 2023 16:04:01 +0800 Subject: [PATCH] first --- .../com/dsic/gj_erp/bean/jcsj/DmBchxjbp.java | 141 ++ .../com/dsic/gj_erp/bean/jcsj/DmBchxmxp.java | 252 ++++ .../com/dsic/gj_erp/bean/jcsj/DmBchxylp.java | 133 ++ .../com/dsic/gj_erp/bean/jcsj/DmBclqjbp.java | 138 ++ .../com/dsic/gj_erp/bean/jcsj/DmBclqmxp.java | 228 +++ .../java/com/dsic/gj_erp/bean/jcsj/DmBom.java | 194 +++ .../com/dsic/gj_erp/bean/jcsj/DmCbxxp.java | 7 +- .../com/dsic/gj_erp/bean/jcsj/DmCzplp.java | 12 +- .../com/dsic/gj_erp/bean/jcsj/DmCzplpNew.java | 8 +- .../com/dsic/gj_erp/bean/jcsj/DmWlqd.java | 243 +++ .../com/dsic/gj_erp/bean/jcsj/DmWpjbp.java | 494 +++++++ .../dsic/gj_erp/bean/jcsj/excel/PlExcel.java | 4 - .../controller/jcsj/BomUploadController.java | 40 + .../controller/jcsj/DmBchxjbpController.java | 19 + .../controller/jcsj/DmBchxmxpController.java | 37 + .../controller/jcsj/DmBchxylpController.java | 35 + .../controller/jcsj/DmBclqjbpController.java | 19 + .../controller/jcsj/DmBclqmxpController.java | 38 + .../controller/jcsj/DmBomController.java | 61 + .../controller/jcsj/DmCbxxpController.java | 10 +- .../controller/jcsj/DmCzplpController.java | 2 - .../controller/jcsj/DmCzplpNewController.java | 2 - .../controller/jcsj/DmWlqdController.java | 38 + .../controller/jcsj/DmWpjbpController.java | 19 + .../gj_erp/dao/sy/Dm_zhbmpRepository.java | 2 +- .../gj_erp/mapper/jcsj/DmBchxjbpMapper.java | 16 + .../gj_erp/mapper/jcsj/DmBchxmxpMapper.java | 24 + .../gj_erp/mapper/jcsj/DmBchxylpMapper.java | 22 + .../gj_erp/mapper/jcsj/DmBclqjbpMapper.java | 16 + .../gj_erp/mapper/jcsj/DmBclqmxpMapper.java | 22 + .../dsic/gj_erp/mapper/jcsj/DmBomMapper.java | 22 + .../gj_erp/mapper/jcsj/DmCbxxpMapper.java | 2 +- .../gj_erp/mapper/jcsj/DmCzplpMapper.java | 2 +- .../gj_erp/mapper/jcsj/DmCzplpNewMapper.java | 2 +- .../dsic/gj_erp/mapper/jcsj/DmWlqdMapper.java | 21 + .../gj_erp/mapper/jcsj/DmWpjbpMapper.java | 16 + .../gj_erp/service/jcsj/DmBchxjbpService.java | 18 + .../gj_erp/service/jcsj/DmBchxmxpService.java | 21 + .../gj_erp/service/jcsj/DmBchxylpService.java | 21 + .../gj_erp/service/jcsj/DmBclqjbpService.java | 16 + .../gj_erp/service/jcsj/DmBclqmxpService.java | 21 + .../gj_erp/service/jcsj/DmBomService.java | 24 + .../gj_erp/service/jcsj/DmCbxxpService.java | 10 +- .../service/jcsj/DmCzplpNewService.java | 3 +- .../gj_erp/service/jcsj/DmCzplpService.java | 2 +- .../gj_erp/service/jcsj/DmWlqdService.java | 21 + .../gj_erp/service/jcsj/DmWpjbpService.java | 16 + .../jcsj/impl/BomUploadServiceImpl.java | 1313 +++++++++++++++++ .../jcsj/impl/DmBchxjbpServiceImpl.java | 20 + .../jcsj/impl/DmBchxmxpServiceImpl.java | 29 + .../jcsj/impl/DmBchxylpServiceImpl.java | 30 + .../jcsj/impl/DmBclqjbpServiceImpl.java | 20 + .../jcsj/impl/DmBclqmxpServiceImpl.java | 40 + .../service/jcsj/impl/DmBomServiceImpl.java | 50 + .../service/jcsj/impl/DmCbxxpServiceImpl.java | 3 +- .../jcsj/impl/DmCzplpNewServiceImpl.java | 62 +- .../service/jcsj/impl/DmCzplpServiceImpl.java | 2 +- .../service/jcsj/impl/DmWlqdServiceImpl.java | 31 + .../service/jcsj/impl/DmWpjbpServiceImpl.java | 20 + .../com/dsic/gj_erp/util/CodeGenerator.java | 20 +- .../java/com/dsic/gj_erp/util/MyFileUtil.java | 38 + src/main/resources/application-dev.properties | 5 +- .../mappers/jcsj/DmBchxjbpMapper.xml | 48 + .../mappers/jcsj/DmBchxmxpMapper.xml | 135 ++ .../mappers/jcsj/DmBchxylpMapper.xml | 105 ++ .../mappers/jcsj/DmBclqjbpMapper.xml | 47 + .../mappers/jcsj/DmBclqmxpMapper.xml | 127 ++ .../resources/mappers/jcsj/DmBomMapper.xml | 185 +++ .../resources/mappers/jcsj/DmWlqdMapper.xml | 136 ++ .../resources/mappers/jcsj/DmWpjbpMapper.xml | 164 ++ 70 files changed, 5070 insertions(+), 74 deletions(-) create mode 100644 src/main/java/com/dsic/gj_erp/bean/jcsj/DmBchxjbp.java create mode 100644 src/main/java/com/dsic/gj_erp/bean/jcsj/DmBchxmxp.java create mode 100644 src/main/java/com/dsic/gj_erp/bean/jcsj/DmBchxylp.java create mode 100644 src/main/java/com/dsic/gj_erp/bean/jcsj/DmBclqjbp.java create mode 100644 src/main/java/com/dsic/gj_erp/bean/jcsj/DmBclqmxp.java create mode 100644 src/main/java/com/dsic/gj_erp/bean/jcsj/DmBom.java create mode 100644 src/main/java/com/dsic/gj_erp/bean/jcsj/DmWlqd.java create mode 100644 src/main/java/com/dsic/gj_erp/bean/jcsj/DmWpjbp.java create mode 100644 src/main/java/com/dsic/gj_erp/controller/jcsj/BomUploadController.java create mode 100644 src/main/java/com/dsic/gj_erp/controller/jcsj/DmBchxjbpController.java create mode 100644 src/main/java/com/dsic/gj_erp/controller/jcsj/DmBchxmxpController.java create mode 100644 src/main/java/com/dsic/gj_erp/controller/jcsj/DmBchxylpController.java create mode 100644 src/main/java/com/dsic/gj_erp/controller/jcsj/DmBclqjbpController.java create mode 100644 src/main/java/com/dsic/gj_erp/controller/jcsj/DmBclqmxpController.java create mode 100644 src/main/java/com/dsic/gj_erp/controller/jcsj/DmBomController.java create mode 100644 src/main/java/com/dsic/gj_erp/controller/jcsj/DmWlqdController.java create mode 100644 src/main/java/com/dsic/gj_erp/controller/jcsj/DmWpjbpController.java create mode 100644 src/main/java/com/dsic/gj_erp/mapper/jcsj/DmBchxjbpMapper.java create mode 100644 src/main/java/com/dsic/gj_erp/mapper/jcsj/DmBchxmxpMapper.java create mode 100644 src/main/java/com/dsic/gj_erp/mapper/jcsj/DmBchxylpMapper.java create mode 100644 src/main/java/com/dsic/gj_erp/mapper/jcsj/DmBclqjbpMapper.java create mode 100644 src/main/java/com/dsic/gj_erp/mapper/jcsj/DmBclqmxpMapper.java create mode 100644 src/main/java/com/dsic/gj_erp/mapper/jcsj/DmBomMapper.java create mode 100644 src/main/java/com/dsic/gj_erp/mapper/jcsj/DmWlqdMapper.java create mode 100644 src/main/java/com/dsic/gj_erp/mapper/jcsj/DmWpjbpMapper.java create mode 100644 src/main/java/com/dsic/gj_erp/service/jcsj/DmBchxjbpService.java create mode 100644 src/main/java/com/dsic/gj_erp/service/jcsj/DmBchxmxpService.java create mode 100644 src/main/java/com/dsic/gj_erp/service/jcsj/DmBchxylpService.java create mode 100644 src/main/java/com/dsic/gj_erp/service/jcsj/DmBclqjbpService.java create mode 100644 src/main/java/com/dsic/gj_erp/service/jcsj/DmBclqmxpService.java create mode 100644 src/main/java/com/dsic/gj_erp/service/jcsj/DmBomService.java create mode 100644 src/main/java/com/dsic/gj_erp/service/jcsj/DmWlqdService.java create mode 100644 src/main/java/com/dsic/gj_erp/service/jcsj/DmWpjbpService.java create mode 100644 src/main/java/com/dsic/gj_erp/service/jcsj/impl/BomUploadServiceImpl.java create mode 100644 src/main/java/com/dsic/gj_erp/service/jcsj/impl/DmBchxjbpServiceImpl.java create mode 100644 src/main/java/com/dsic/gj_erp/service/jcsj/impl/DmBchxmxpServiceImpl.java create mode 100644 src/main/java/com/dsic/gj_erp/service/jcsj/impl/DmBchxylpServiceImpl.java create mode 100644 src/main/java/com/dsic/gj_erp/service/jcsj/impl/DmBclqjbpServiceImpl.java create mode 100644 src/main/java/com/dsic/gj_erp/service/jcsj/impl/DmBclqmxpServiceImpl.java create mode 100644 src/main/java/com/dsic/gj_erp/service/jcsj/impl/DmBomServiceImpl.java create mode 100644 src/main/java/com/dsic/gj_erp/service/jcsj/impl/DmWlqdServiceImpl.java create mode 100644 src/main/java/com/dsic/gj_erp/service/jcsj/impl/DmWpjbpServiceImpl.java create mode 100644 src/main/java/com/dsic/gj_erp/util/MyFileUtil.java create mode 100644 src/main/resources/mappers/jcsj/DmBchxjbpMapper.xml create mode 100644 src/main/resources/mappers/jcsj/DmBchxmxpMapper.xml create mode 100644 src/main/resources/mappers/jcsj/DmBchxylpMapper.xml create mode 100644 src/main/resources/mappers/jcsj/DmBclqjbpMapper.xml create mode 100644 src/main/resources/mappers/jcsj/DmBclqmxpMapper.xml create mode 100644 src/main/resources/mappers/jcsj/DmBomMapper.xml create mode 100644 src/main/resources/mappers/jcsj/DmWlqdMapper.xml create mode 100644 src/main/resources/mappers/jcsj/DmWpjbpMapper.xml diff --git a/src/main/java/com/dsic/gj_erp/bean/jcsj/DmBchxjbp.java b/src/main/java/com/dsic/gj_erp/bean/jcsj/DmBchxjbp.java new file mode 100644 index 0000000..c036902 --- /dev/null +++ b/src/main/java/com/dsic/gj_erp/bean/jcsj/DmBchxjbp.java @@ -0,0 +1,141 @@ +package com.dsic.gj_erp.bean.jcsj; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serializable; +import java.math.BigDecimal; + +/** + *

+ * + *

+ * + * @author xn + * @since 2023-09-20 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@TableName("DM_BCHXJBP") +@ApiModel(value="DmBchxjbp对象", description="") +public class DmBchxjbp implements Serializable { + + private static final long serialVersionUID=1L; + + @ApiModelProperty(value = "船号") + @TableField("DC_CH") + private String dcCh; + + @ApiModelProperty(value = "船名") + @TableField("DC_CM") + private String dcCm; + + @ApiModelProperty(value = "批量") + @TableField("DC_FD") + private String dcFd; + + @ApiModelProperty(value = "批量") + @TableField("DC_PL") + private String dcPl; + + @ApiModelProperty(value = "组立") + @TableField("DC_ZL") + private String dcZl; + + @ApiModelProperty(value = "材料名称") + @TableField("CLMC") + private String clmc; + + @ApiModelProperty(value = "原图纸编号") + @TableField("TZBH1") + private String tzbh1; + + @TableField("SHZL") + private Double shzl; + + @TableField("ZYRQ") + private String zyrq; + + @TableField("GCBH") + private String gcbh; + + @TableField("HXCD") + private BigDecimal hxcd; + + @TableField("TXBL") + private String txbl; + + @TableField("ZDRQ") + private String zdrq; + + @TableField("YLZD3") + private String ylzd3; + + @TableField("WPGG") + private String wpgg; + + @TableField("LJSL") + private BigDecimal ljsl; + + @TableField("DC_LPH") + private String dcLph; + + @TableField("YLZD6") + private Double ylzd6; + + @TableField("TZBH") + private String tzbh; + + @TableField("CLZL") + private Double clzl; + + @TableField("HXFL") + private String hxfl; + + @TableField("XTRQ") + private String xtrq; + + @TableField("WPXH") + private String wpxh; + + @TableField("YLZD1") + private String ylzd1; + + @TableField("YLZD4") + private BigDecimal ylzd4; + + @TableField("YCLZL") + private Double yclzl; + + @TableField("BZ") + private String bz; + + @TableField("YLZD5") + private Double ylzd5; + + @TableId(value = "HXBH", type = IdType.ASSIGN_UUID) + private String hxbh; + + @TableField("YLZL") + private Double ylzl; + + @TableField("ZDR") + private String zdr; + + @TableField("YLBH") + private String ylbh; + + @TableField("WGRQ") + private String wgrq; + + @TableField("YLZD2") + private String ylzd2; + + +} diff --git a/src/main/java/com/dsic/gj_erp/bean/jcsj/DmBchxmxp.java b/src/main/java/com/dsic/gj_erp/bean/jcsj/DmBchxmxp.java new file mode 100644 index 0000000..72dd1b4 --- /dev/null +++ b/src/main/java/com/dsic/gj_erp/bean/jcsj/DmBchxmxp.java @@ -0,0 +1,252 @@ +package com.dsic.gj_erp.bean.jcsj; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serializable; +import java.math.BigDecimal; + +/** + *

+ * + *

+ * + * @author xn + * @since 2023-09-20 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@TableName("DM_BCHXMXP") +@ApiModel(value="DmBchxmxp对象", description="") +public class DmBchxmxp implements Serializable { + + private static final long serialVersionUID=1L; + + @ApiModelProperty(value = "序号") + @TableId(value = "XH", type = IdType.ASSIGN_UUID) + private Double xh; + + @ApiModelProperty(value = "零件编号") + @TableField("WPH") + private String wph; + + @ApiModelProperty(value = "数量") + @TableField("SL") + private BigDecimal sl; + + @ApiModelProperty(value = "修改人") + @TableField("XGR") + private String xgr; + + @ApiModelProperty(value = "修改日期") + @TableField("XGRQ") + private String xgrq; + + @ApiModelProperty(value = "零件信息") + @TableField("LJXX") + private String ljxx; + + @ApiModelProperty(value = "零件特征") + private String ljtz; + + @ApiModelProperty(value = "工厂编号") + @TableField("GCBH_z") + private String gcbhZ; + + @ApiModelProperty(value = "船号") + @TableField("DC_CH_z") + private String dcChZ; + + @ApiModelProperty(value = "船名") + @TableField("DC_CM_z") + private String dcCmZ; + + @ApiModelProperty(value = "分段") + @TableField("DC_FD_z") + private String dcFdZ; + + @ApiModelProperty(value = "批量") + @TableField("DC_PL_z") + private String dcPlZ; + + @ApiModelProperty(value = "组立") + @TableField("DC_ZL_z") + private String dcZlZ; + + @ApiModelProperty(value = "图纸编号") + @TableField("TJBH_z") + private String tjbhZ; + + @ApiModelProperty(value = "下图日期") + @TableField("XTRQ_z") + private String xtrqZ; + + @ApiModelProperty(value = "余料编号") + @TableField("YLBH_z") + private String ylbhZ; + + @ApiModelProperty(value = "规格") + @TableField("WPGG_z") + private String wpggZ; + + @ApiModelProperty(value = "材质") + @TableField("WPXH_z") + private String wpxhZ; + + @ApiModelProperty(value = "图形比例") + @TableField("TXBL_z") + private String txblZ; + + @ApiModelProperty(value = "零件数量") + @TableField("LJSL_z") + private BigDecimal ljslZ; + + @ApiModelProperty(value = "材料重量") + @TableField("YCLZL_z") + private Double yclzlZ; + + @ApiModelProperty(value = "实耗重量") + @TableField("SHZL_z") + private Double shzlZ; + + @ApiModelProperty(value = "残料重量") + @TableField("CLZL_z") + private Double clzlZ; + + @ApiModelProperty(value = "余料重量") + @TableField("YLZL_z") + private Double ylzlZ; + + @ApiModelProperty(value = "划线长度") + @TableField("HXCD_z") + private BigDecimal hxcdZ; + + @ApiModelProperty(value = "炉批号") + @TableField("DC_LPH_z") + private String dcLphZ; + + @ApiModelProperty(value = "完工日期") + @TableField("WGRQ_z") + private String wgrqZ; + + @ApiModelProperty(value = "作业人员") + @TableField("ZYRQ_z") + private String zyrqZ; + + @ApiModelProperty(value = "划线类型") + @TableField("YLZD1_z") + private String ylzd1Z; + + @ApiModelProperty(value = "材料来源") + @TableField("YLZD2_z") + private String ylzd2Z; + + @ApiModelProperty(value = "切割长度") + @TableField("YLZD4_z") + private BigDecimal ylzd4Z; + + @ApiModelProperty(value = "划线分类") + @TableField("HXFL_z") + private String hxflZ; + + @ApiModelProperty(value = "材料名称") + @TableField("CLMC_z") + private String clmcZ; + + @ApiModelProperty(value = "原图纸编号") + @TableField("TZBH1_z") + private String tzbh1Z; + + @ApiModelProperty(value = "原图纸编号") + @TableField("TZBH_z") + private String tzbhZ; + + @ApiModelProperty(value = "状态：0:编辑1:提交2:审核") + private String zt; + + @ApiModelProperty(value = "跨位") + @TableField("ZZCJ") + private String zzcj; + + @ApiModelProperty(value = "打孔数量") + private Integer dksl; + + @ApiModelProperty(value = "切割空程长度") + private Double cdQgkc; + + @ApiModelProperty(value = "坡口标识") + private String pkbs; + + @ApiModelProperty(value = "坡口类型") + private String pklx; + + @ApiModelProperty(value = "坡口度数") + private Double pkds; + + @ApiModelProperty(value = "坡口长度") + private Double cdPk; + + @ApiModelProperty(value = "打磨标识") + private String dmbs; + + @ApiModelProperty(value = "打磨长度") + private Double cdDm; + + @ApiModelProperty(value = "曲面标识") + private String qmbs; + + @TableField("YLZD3") + private String ylzd3; + + @TableField("ZDR_z") + private String zdrZ; + + @TableField("YLZD6") + private Double ylzd6; + + @TableField("BZ") + private String bz; + + @TableField("YLZD4") + private Double ylzd4; + + @TableField("YLZD5_z") + private Double ylzd5Z; + + @TableField("YLZD1") + private String ylzd1; + + @TableField("ZDRQ_z") + private String zdrqZ; + + @TableField("LJBH") + private String ljbh; + + @TableField("YLZD6_z") + private Double ylzd6Z; + + @TableField("YLZD3_z") + private String ylzd3Z; + + @TableField("YLZD2") + private String ylzd2; + + @TableField("HXBH") + private String hxbh; + + @TableField("BZ_z") + private String bzZ; + + @TableField("YLZD5") + private Double ylzd5; + + private int drcs; + + +} diff --git a/src/main/java/com/dsic/gj_erp/bean/jcsj/DmBchxylp.java b/src/main/java/com/dsic/gj_erp/bean/jcsj/DmBchxylp.java new file mode 100644 index 0000000..2e88e25 --- /dev/null +++ b/src/main/java/com/dsic/gj_erp/bean/jcsj/DmBchxylp.java @@ -0,0 +1,133 @@ +package com.dsic.gj_erp.bean.jcsj; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serializable; +import java.math.BigDecimal; + +/** + *

+ * + *

+ * + * @author xn + * @since 2023-09-19 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="DmBchxylp对象", description="") +public class DmBchxylp implements Serializable { + + private static final long serialVersionUID=1L; + + @ApiModelProperty(value = "余料编号(板材)") + private String ylbh; + + @ApiModelProperty(value = "套料图号") + private String tzbh; + + @ApiModelProperty(value = "类型") + private String hxfl; + + @ApiModelProperty(value = "规格") + private String wpgg; + + @ApiModelProperty(value = "材质") + private String wpxh; + + @ApiModelProperty(value = "备注") + private String bz; + + @ApiModelProperty(value = "导入人") + private String zdr; + + @ApiModelProperty(value = "导入日期") + private String zdrq; + + @ApiModelProperty(value = "划线类型(板材)") + private String ylzd1; + + @ApiModelProperty(value = "船号") + private String dcCh; + + @ApiModelProperty(value = "批量") + private String dcPl; + + @ApiModelProperty(value = "组立") + private String dcZl; + + @ApiModelProperty(value = "余料") + private String sfyl; + + @ApiModelProperty(value = "余料规格(板材)") + private String ylgg; + @ApiModelProperty(value = "余料规格s(板材)") + private String ylggs; + + @ApiModelProperty(value = "数量") + private BigDecimal sl; + + @ApiModelProperty(value = "余料数量") + private Double ylsl; + + @ApiModelProperty(value = "型材名称(型材)") + private String xcmc; + + @ApiModelProperty(value = "型材长度(型材)") + private BigDecimal xccd; + + @ApiModelProperty(value = "余料长度(型材)") + private BigDecimal ylcd; + + @ApiModelProperty(value = "加工跨") + @TableField("ZZCJ") + private String zzcj; + + @ApiModelProperty(value = "导入人员") + private String drry; + + @ApiModelProperty(value = "导入日期") + private String drrq; + + @ApiModelProperty(value = "导入次数") + private Integer drcs; + + private String bgr; + + @TableId(value = "hxbh", type = IdType.ASSIGN_UUID) + private String hxbh; + + private Double ylzd6; + + private String rkph; + + private String kwh; + + private Double ylzd4; + + private Double xh; + + private Double ylzd5; + + private String rkbs; + + private String ylzd2; + + private String rkrq; + + private String jldw; + + private String ylzd3; + + private Double ylzl; + + private String drbs; + + +} diff --git a/src/main/java/com/dsic/gj_erp/bean/jcsj/DmBclqjbp.java b/src/main/java/com/dsic/gj_erp/bean/jcsj/DmBclqjbp.java new file mode 100644 index 0000000..e9be159 --- /dev/null +++ b/src/main/java/com/dsic/gj_erp/bean/jcsj/DmBclqjbp.java @@ -0,0 +1,138 @@ +package com.dsic.gj_erp.bean.jcsj; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serializable; +import java.math.BigDecimal; + +/** + *

+ * + *

+ * + * @author xn + * @since 2023-09-15 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@TableName("DM_BCLQJBP") +@ApiModel(value="DmBclqjbp对象", description="") +public class DmBclqjbp implements Serializable { + + private static final long serialVersionUID=1L; + + @ApiModelProperty(value = "组立") + @TableField("DC_ZL") + private String dcZl; + + @ApiModelProperty(value = "船号") + @TableField("DC_CH") + private String dcCh; + + @ApiModelProperty(value = "船名") + @TableField("DC_CM") + private String dcCm; + + @ApiModelProperty(value = "批量") + @TableField("DC_FD") + private String dcFd; + + @ApiModelProperty(value = "定额类型") + @TableField("DELX") + private String delx; + + @ApiModelProperty(value = "组立") + @TableField("XMBH") + private String xmbh; + + @ApiModelProperty(value = "组立") + @TableField("YBZS") + private BigDecimal ybzs; + + @ApiModelProperty(value = "计算米数") + private BigDecimal jsms; + + @ApiModelProperty(value = "实耗米数") + private BigDecimal shms; + + @TableField("SHZL") + private BigDecimal shzl; + + @TableField("XL") + private BigDecimal xl; + + @TableField("DC_PL") + private String dcPl; + + @TableField("ZDRQ") + private String zdrq; + + @TableField("ZXDW") + private String zxdw; + + @TableField("YLZD6") + private BigDecimal ylzd6; + + @TableField("LQMJ") + private BigDecimal lqmj; + + @TableField("YLZD3") + private String ylzd3; + + @TableField("LJZL") + private BigDecimal ljzl; + + @TableField("YLZL") + private BigDecimal ylzl; + + @TableField("DERQ") + private String derq; + + @TableField("YLZD4") + private BigDecimal ylzd4; + + @TableField("ZZCJ") + private String zzcj; + + @TableField("TZBH") + private String tzbh; + + @TableField("YLZD1") + private String ylzd1; + + @TableId(value = "LQBH", type = IdType.ASSIGN_UUID) + private String lqbh; + + @TableField("BZ") + private String bz; + + @TableField("LQZL") + private BigDecimal lqzl; + + @TableField("YLZD2") + private String ylzd2; + + @TableField("LQLB") + private String lqlb; + + @TableField("ZDR") + private String zdr; + + @TableField("QPYLD") + private BigDecimal qpyld; + + @TableField("YLZD5") + private BigDecimal ylzd5; + + @TableField("CJDQ") + private BigDecimal cjdq; + + +} diff --git a/src/main/java/com/dsic/gj_erp/bean/jcsj/DmBclqmxp.java b/src/main/java/com/dsic/gj_erp/bean/jcsj/DmBclqmxp.java new file mode 100644 index 0000000..6aa7942 --- /dev/null +++ b/src/main/java/com/dsic/gj_erp/bean/jcsj/DmBclqmxp.java @@ -0,0 +1,228 @@ +package com.dsic.gj_erp.bean.jcsj; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serializable; +import java.math.BigDecimal; + +/** + *

+ * + *

+ * + * @author xn + * @since 2023-09-15 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@TableName("DM_BCLQMXP") +@ApiModel(value="DmBclqmxp对象", description="") +public class DmBclqmxp implements Serializable { + + private static final long serialVersionUID=1L; + + @ApiModelProperty(value = "序号") + @TableId(value = "XH", type = IdType.ASSIGN_UUID) + private BigDecimal xh; + + @ApiModelProperty(value = "物品号(规格型材)") + @TableField("WPH") + private String wph; + + @ApiModelProperty(value = "材质(板材)") + @TableField("WPXH") + private String wpxh; + + @ApiModelProperty(value = "材质/规格(板材)") + @TableField("WPGG") + private String wpgg; + + @ApiModelProperty(value = "根数/板数(板材)") + @TableField("SL") + private BigDecimal sl; + + @ApiModelProperty(value = "领取重量") + @TableField("LQZL") + private BigDecimal lqzl; + + @ApiModelProperty(value = "实耗重量") + @TableField("SHZL") + private BigDecimal shzl; + + @ApiModelProperty(value = "余料重量") + @TableField("YLZL") + private BigDecimal ylzl; + + @ApiModelProperty(value = "前批余料代") + @TableField("QPYLD") + private BigDecimal qpyld; + + @ApiModelProperty(value = "长度(型材)") + @TableField("YLZD11") + private BigDecimal ylzd11; + + @ApiModelProperty(value = "领取米数(型材)") + private BigDecimal lqms; + + @ApiModelProperty(value = "实耗米数(型材)") + private BigDecimal shms; + + @ApiModelProperty(value = "名称(型材)") + @TableField("WPMC") + private String wpmc; + + @ApiModelProperty(value = "零件套料重量(板材)") + @TableField("LJZL") + private BigDecimal ljzl; + + @ApiModelProperty(value = "最近切割日期(板材)") + private String qgrq; + + @ApiModelProperty(value = "切割数量(板材)") + private BigDecimal qgsl; + + @ApiModelProperty(value = "领取类别") + @TableField("LQLB_z") + private String lqlbZ; + + @ApiModelProperty(value = "批量") + @TableField("DC_PL_z") + private String dcPlZ; + + @ApiModelProperty(value = "组立") + @TableField("DC_ZL_z") + private String dcZlZ; + + @ApiModelProperty(value = "船号") + @TableField("DC_CH_z") + private String dcChZ; + + @ApiModelProperty(value = "船名") + @TableField("DC_CM_z") + private String dcCmZ; + + @ApiModelProperty(value = "分段") + @TableField("DC_FD_z") + private String dcFdZ; + + @ApiModelProperty(value = "定额类型") + @TableField("DELX_z") + private String delxZ; + + @ApiModelProperty(value = "导入日期") + @TableField("DERQ_z") + private String derqZ; + + @ApiModelProperty(value = "项目编号") + @TableField("XMBH_z") + private String xmbhZ; + + @ApiModelProperty(value = "用板总数") + @TableField("YBZS_z") + private BigDecimal ybzsZ; + + @ApiModelProperty(value = "领取重量(总)") + @TableField("LQZL_z") + private BigDecimal lqzlZ; + + @ApiModelProperty(value = "实耗重量(总)") + @TableField("SHZL_z") + private BigDecimal shzlZ; + + @ApiModelProperty(value = "余料重量(总)") + @TableField("YLZL_z") + private BigDecimal ylzlZ; + + @ApiModelProperty(value = "前批余料代(总)") + @TableField("QPYLD_z") + private BigDecimal qpyldZ; + + @ApiModelProperty(value = "执行单位") + @TableField("ZXDW_z") + private String zxdwZ; + + @ApiModelProperty(value = "领取面积") + @TableField("LQMJ_z") + private BigDecimal lqmjZ; + + @ApiModelProperty(value = "车间底漆") + @TableField("CJDQ_z") + private BigDecimal cjdqZ; + + @ApiModelProperty(value = "稀料") + @TableField("XL_z") + private BigDecimal xlZ; + + @ApiModelProperty(value = "制单人") + @TableField("ZDR_z") + private String zdrZ; + + @ApiModelProperty(value = "制单日期") + @TableField("ZDRQ_z") + private String zdrqZ; + + @ApiModelProperty(value = "计算米数") + @TableField("JSMS_z") + private BigDecimal jsmsZ; + + @ApiModelProperty(value = "实耗米数(总)") + @TableField("SHMS_z") + private BigDecimal shmsZ; + + @ApiModelProperty(value = "零件套料重量") + @TableField("LJZL_z") + private BigDecimal ljzlZ; + + @ApiModelProperty(value = "加工跨") + @TableField("ZZCJ_z") + private String zzcjZ; + + @ApiModelProperty(value = "导入次数") + private Integer drcs; + + @TableField("YLZD12") + private BigDecimal ylzd12; + + @TableField("XGRQ") + private String xgrq; + + @TableField("BZ_z") + private String bzZ; + + @TableField("YLZD9") + private String ylzd9; + + @TableField("YLZD10") + private BigDecimal ylzd10; + + @TableField("BZ") + private String bz; + + @TableField("YLZD7") + private String ylzd7; + + @TableField("XGR") + private String xgr; + + @TableField("YLZD8") + private String ylzd8; + + private BigDecimal sysl; + + @TableField("LQBH") + private String lqbh; + + @TableField(exist = false) + private BigDecimal dztlzl; + @TableField(exist = false) + private BigDecimal tlshbl; + + +} diff --git a/src/main/java/com/dsic/gj_erp/bean/jcsj/DmBom.java b/src/main/java/com/dsic/gj_erp/bean/jcsj/DmBom.java new file mode 100644 index 0000000..b055796 --- /dev/null +++ b/src/main/java/com/dsic/gj_erp/bean/jcsj/DmBom.java @@ -0,0 +1,194 @@ +package com.dsic.gj_erp.bean.jcsj; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serializable; +import java.math.BigDecimal; + +/** + *

+ * + *

+ * + * @author xn + * @since 2023-09-25 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="DmBom对象", description="") +public class DmBom implements Serializable { + + private static final long serialVersionUID=1L; + + @ApiModelProperty(value = "船号") + private String dcch; + + @ApiModelProperty(value = "目标船号") + private String mbch; + + @ApiModelProperty(value = "数据船号") + private String sjch; + + @ApiModelProperty(value = "批量") + private String pl; + + @ApiModelProperty(value = "分段") + private String fd; + + @ApiModelProperty(value = "需求地点") + private String xqdd; + + @ApiModelProperty(value = "抛丸") + private String pw; + + @ApiModelProperty(value = "领取类别") + private String lqlb; + + @ApiModelProperty(value = "跨位") + private String kw; + + @ApiModelProperty(value = "设备编号") + private String sbbh; + + @ApiModelProperty(value = "设备类型") + private String sclx; + + @ApiModelProperty(value = "组立") + private String zl; + + @ApiModelProperty(value = "物品材质") + private String wpcz; + + @ApiModelProperty(value = "物品规格") + private String wpgg; + + @ApiModelProperty(value = "板厚") + private BigDecimal bh; + + @ApiModelProperty(value = "版长") + private BigDecimal bc; + + @ApiModelProperty(value = "油漆用量") + private Double yqyl; + + @ApiModelProperty(value = "切割长度") + private BigDecimal qgcd; + @ApiModelProperty(value = "划线长度") + private BigDecimal hxcd; + + @ApiModelProperty(value = "图纸编号") + private String tzbh; + + @ApiModelProperty(value = "套料数量") + private BigDecimal tlsl; + + @ApiModelProperty(value = "坡口类型") + private String pklx; + + @ApiModelProperty(value = "曲标识") + private String qbs; + + @ApiModelProperty(value = "坡口長度") + private String pkbs; + + @ApiModelProperty(value = "坡口标识") + private Double pkcd; + + @ApiModelProperty(value = "打磨标识") + private String dmbs; + + @ApiModelProperty(value = "打磨长度") + private Double dmcd; + + @ApiModelProperty(value = "装配顺序") + private Integer zpsx; + + @ApiModelProperty(value = "零件编号") + private String ljbh; + + @ApiModelProperty(value = "零件数量") + private BigDecimal ljsl; + + @ApiModelProperty(value = "零件属性") + private String ljsx; + + @ApiModelProperty(value = "单件面积") + private Double djmj; + + @ApiModelProperty(value = "零件单重") + private Double ljdz; + + @ApiModelProperty(value = "备料") + private Double blgs; + + @ApiModelProperty(value = "抛丸") + private Double pwgs; + + @ApiModelProperty(value = "理料") + private Double llgs; + + @ApiModelProperty(value = "划线") + private Double hxgs; + + @ApiModelProperty(value = "切割") + private Double qggs; + + @ApiModelProperty(value = "坡口") + private Double pkgs; + + @ApiModelProperty(value = "曲") + private Double qgs; + + @ApiModelProperty(value = "打磨") + private Double dmgs; + + @ApiModelProperty(value = "装配") + private Double zpgs; + + @ApiModelProperty(value = "反馈备料") + private Double fkblgs; + + @ApiModelProperty(value = "抛丸") + private Double fkpwgs; + + @ApiModelProperty(value = "理料") + private Double fkllgs; + + @ApiModelProperty(value = "划线") + private Double fkhxgs; + + @ApiModelProperty(value = "切割") + private Double fkqggs; + + @ApiModelProperty(value = "坡口") + private Double fkpkgs; + + @ApiModelProperty(value = "曲") + private Double fkqgs; + + @ApiModelProperty(value = "打磨") + private Double fkdmgs; + + @ApiModelProperty(value = "装配") + private Double fkzpgs; + + private Integer pid; + + private String type; + + @TableId(value = "id", type = IdType.AUTO) + private Integer id; + + private String fds; + + private String lqbs; + + private String tjbs; + + +} diff --git a/src/main/java/com/dsic/gj_erp/bean/jcsj/DmCbxxp.java b/src/main/java/com/dsic/gj_erp/bean/jcsj/DmCbxxp.java index 2764610..795c288 100644 --- a/src/main/java/com/dsic/gj_erp/bean/jcsj/DmCbxxp.java +++ b/src/main/java/com/dsic/gj_erp/bean/jcsj/DmCbxxp.java @@ -1,10 +1,9 @@ package com.dsic.gj_erp.bean.jcsj; -import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableField; -import java.io.Serializable; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -12,6 +11,8 @@ import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.Setter; +import java.io.Serializable; + /** *

* diff --git a/src/main/java/com/dsic/gj_erp/bean/jcsj/DmCzplp.java b/src/main/java/com/dsic/gj_erp/bean/jcsj/DmCzplp.java index 9492d96..1e49a44 100644 --- a/src/main/java/com/dsic/gj_erp/bean/jcsj/DmCzplp.java +++ b/src/main/java/com/dsic/gj_erp/bean/jcsj/DmCzplp.java @@ -1,17 +1,17 @@ package com.dsic.gj_erp.bean.jcsj; -import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableField; -import java.io.Serializable; -import java.math.BigDecimal; - +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; +import java.io.Serializable; +import java.math.BigDecimal; + /** *

* @@ -28,7 +28,7 @@ public class DmCzplp implements Serializable { private static final long serialVersionUID=1L; - @ApiModelProperty(value = "船号") + @ApiModelProperty(value = "1111") @TableField("DC_CH") private String dcCh; diff --git a/src/main/java/com/dsic/gj_erp/bean/jcsj/DmCzplpNew.java b/src/main/java/com/dsic/gj_erp/bean/jcsj/DmCzplpNew.java index 990f0d2..5c33927 100644 --- a/src/main/java/com/dsic/gj_erp/bean/jcsj/DmCzplpNew.java +++ b/src/main/java/com/dsic/gj_erp/bean/jcsj/DmCzplpNew.java @@ -1,16 +1,16 @@ package com.dsic.gj_erp.bean.jcsj; import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableField; -import java.io.Serializable; -import java.math.BigDecimal; - +import com.baomidou.mybatisplus.annotation.TableId; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; +import java.io.Serializable; +import java.math.BigDecimal; + /** *

* diff --git a/src/main/java/com/dsic/gj_erp/bean/jcsj/DmWlqd.java b/src/main/java/com/dsic/gj_erp/bean/jcsj/DmWlqd.java new file mode 100644 index 0000000..5b55ba4 --- /dev/null +++ b/src/main/java/com/dsic/gj_erp/bean/jcsj/DmWlqd.java @@ -0,0 +1,243 @@ +package com.dsic.gj_erp.bean.jcsj; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serializable; +import java.math.BigDecimal; + +/** + *

+ * + *

+ * + * @author xn + * @since 2023-09-21 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@TableName("DM_WLQD") +@ApiModel(value="DmWlqd对象", description="") +public class DmWlqd implements Serializable { + + private static final long serialVersionUID=1L; + + @ApiModelProperty(value = "物品级别") + @TableField("WPJB") + private String wpjb; + + @ApiModelProperty(value = "物品分类") + @TableField("WPFLM") + private String wpflm; + + @ApiModelProperty(value = "编制人") + @TableField("ZDRY") + private String zdry; + + @ApiModelProperty(value = "编制日期") + @TableField("XGRQ") + private String xgrq; + + @ApiModelProperty(value = "船号") + @TableField("DC_CH") + private String dcCh; + + @ApiModelProperty(value = "船名") + @TableField("DC_CM") + private String dcCm; + + @ApiModelProperty(value = "批量") + @TableField("DC_PL") + private String dcPl; + + @ApiModelProperty(value = "分段") + @TableField("DC_FD") + private String dcFd; + + @ApiModelProperty(value = "图号") + @TableField("DC_TH") + private String dcTh; + + @ApiModelProperty(value = "组立") + @TableField("DC_ZL") + private String dcZl; + + @ApiModelProperty(value = "特征") + @TableField("DC_TZ") + private String dcTz; + + @ApiModelProperty(value = "依据") + @TableField("DC_YJ") + private String dcYj; + + @ApiModelProperty(value = "页数") + @TableField("DC_YS") + private String dcYs; + + @ApiModelProperty(value = "拼板") + @TableField("DC_PB") + private String dcPb; + + @ApiModelProperty(value = "炉批号") + @TableField("DC_LPH") + private String dcLph; + + @ApiModelProperty(value = "托盘编号") + @TableField("DC_TPBH") + private String dcTpbh; + + @ApiModelProperty(value = "托盘名称") + @TableField("DC_TPMC") + private String dcTpmc; + + @ApiModelProperty(value = "单价重量计量单位") + @TableField("JLDW1") + private String jldw1; + + @ApiModelProperty(value = "物品名称") + @TableField("WPMC") + private String wpmc; + + @ApiModelProperty(value = "规格") + @TableField("WPGG") + private String wpgg; + + @ApiModelProperty(value = "材质") + @TableField("WPXH") + private String wpxh; + + @ApiModelProperty(value = "ABC分类") + @TableField("ABCLX") + private String abclx; + + @ApiModelProperty(value = "加工进度") + @TableField("GZLX") + private String gzlx; + + @ApiModelProperty(value = "配套表类型") + @TableField("YLZD1") + private String ylzd1; + + @ApiModelProperty(value = "流程码") + @TableField("LCM1") + private String lcm1; + + @ApiModelProperty(value = "状态") + private String zt; + + @TableField("YLZD2") + private String ylzd2; + + @TableField("YLZD8") + private String ylzd8; + + @TableField("DEZL") + private BigDecimal dezl; + + @TableField("LCM5") + private String lcm5; + + @TableField("XNJBS") + private String xnjbs; + + @TableField("SL") + private BigDecimal sl; + + @TableField("YLZD5") + private Double ylzd5; + + @TableField("YXZZRQ") + private Double yxzzrq; + + @TableField("LCM2") + private String lcm2; + + @TableField("JLDW") + private String jldw; + + @TableField("YLZD6") + private Double ylzd6; + + @TableField("GYSBH") + private String gysbh; + + @TableField("TQQXZL") + private Double tqqxzl; + + @TableField("YLZD3") + private String ylzd3; + + @TableId(value = "XWH", type = IdType.ASSIGN_UUID) + private Double xwh; + + @TableField("BZ") + private String bz; + + @TableField("YLZD9") + private String ylzd9; + + @TableField("YLZD4") + private Double ylzd4; + + @TableField("ZXWPH") + private String zxwph; + + @TableField("GYLB") + private String gylb; + + @TableField("YXQSRQ") + private Double yxqsrq; + + @TableField("DRRY") + private String drry; + + @TableField("LCM3") + private String lcm3; + + @TableField("YHFLH") + private String yhflh; + + @TableField("WPH") + private String wph; + + @TableField("XLCC") + private String xlcc; + + @TableField("FXWPH") + private String fxwph; + + @TableField("WPCC") + private String wpcc; + + @TableField("JZL") + private Double jzl; + + @TableField("FWPJB") + private String fwpjb; + + @TableField("YLZD7") + private String ylzd7; + + @TableField("SJBCSL") + private Double sjbcsl; + + @TableField("DRRQ") + private String drrq; + + @TableField("LCM4") + private String lcm4; + + private int drcs; + + + @TableField(exist = false) + private String tzbh; + + +} diff --git a/src/main/java/com/dsic/gj_erp/bean/jcsj/DmWpjbp.java b/src/main/java/com/dsic/gj_erp/bean/jcsj/DmWpjbp.java new file mode 100644 index 0000000..89ab7b4 --- /dev/null +++ b/src/main/java/com/dsic/gj_erp/bean/jcsj/DmWpjbp.java @@ -0,0 +1,494 @@ +package com.dsic.gj_erp.bean.jcsj; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serializable; + +/** + *

+ * + *

+ * + * @author xn + * @since 2023-09-21 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@TableName("DM_WPJBP") +@ApiModel(value="DmWpjbp对象", description="") +public class DmWpjbp implements Serializable { + + private static final long serialVersionUID=1L; + + @ApiModelProperty(value = "船号") + @TableField("DC_CH") + private String dcCh; + + @ApiModelProperty(value = "船名") + @TableField("DC_CM") + private String dcCm; + + @ApiModelProperty(value = "批量") + @TableField("DC_PL") + private String dcPl; + + @ApiModelProperty(value = "分段") + @TableField("DC_FD") + private String dcFd; + + @ApiModelProperty(value = "图号") + @TableField("DC_TH") + private String dcTh; + + @ApiModelProperty(value = "组立") + @TableField("DC_ZL") + private String dcZl; + + @ApiModelProperty(value = "特征") + @TableField("DC_TZ") + private String dcTz; + + @ApiModelProperty(value = "依据") + @TableField("DC_YJ") + private String dcYj; + + @ApiModelProperty(value = "页数") + @TableField("DC_YS") + private String dcYs; + + @ApiModelProperty(value = "拼板") + @TableField("DC_PB") + private String dcPb; + + @ApiModelProperty(value = "炉批号") + @TableField("DC_LPH") + private String dcLph; + + @ApiModelProperty(value = "托盘编号") + @TableField("DC_TPBH") + private String dcTpbh; + + @ApiModelProperty(value = "托盘名称") + @TableField("DC_TPMC") + private String dcTpmc; + + @TableField("ZJBS") + private String zjbs; + + @TableField("WPZS") + private String wpzs; + + @TableField("CPLL_JLDW") + private String cpllJldw; + + @TableField("YHFLH") + private String yhflh; + + @TableId(value = "WPH", type = IdType.ASSIGN_UUID) + private String wph; + + @TableField("YXQSSJ") + private String yxqssj; + + @TableField("KJKMBM") + private String kjkmbm; + + @TableField("JSTJ") + private String jstj; + + @TableField("DJGL") + private Double djgl; + + @TableField("XGSJCG") + private String xgsjcg; + + @TableField("DJDY_JLDW") + private String djdyJldw; + + @TableField("BPL") + private Double bpl; + + @TableField("GJJBS") + private String gjjbs; + + @TableField("WPFLM4") + private String wpflm4; + + @TableField("WPXH") + private String wpxh; + + @TableField("ZTF") + private Double ztf; + + @TableField("GYCZY") + private String gyczy; + + @TableField("BSLX") + private String bslx; + + @TableField("JLDW1") + private String jldw1; + + @TableField("PLJS") + private Integer pljs; + + @TableField("BZJGXGR") + private String bzjgxgr; + + @TableField("FPXS") + private Double fpxs; + + @TableField("WPJSTJ") + private String wpjstj; + + @TableField("CPCS") + private Double cpcs; + + @TableField("ZDRYQL") + private String zdryql; + + @TableField("ZGZQ") + private Double zgzq; + + @TableField("ZDPL") + private Double zdpl; + + @TableField("ZL") + private Double zl; + + @TableField("ZXBZH") + private String zxbzh; + + @TableField("JLCD") + private Double jlcd; + + @TableField("JGCZY") + private String jgczy; + + @TableField("YLZD2") + private String ylzd2; + + @TableField("CCXGR") + private String ccxgr; + + @TableField("XGSJ") + private String xgsj; + + @TableField("CGJLDW") + private String cgjldw; + + @TableField("DEZL") + private Double dezl; + + @TableField("BZJGXGRQ") + private String bzjgxgrq; + + @TableField("DWHSL") + private Double dwhsl; + + @TableField("FJBS") + private String fjbs; + + @TableField("XGSJQL") + private String xgsjql; + + @TableField("FDGZQ") + private Double fdgzq; + + @TableField("ZDRYTQ") + private String zdrytq; + + @TableField("YLZD5") + private Double ylzd5; + + @TableField("JYC") + private Double jyc; + + @TableField("WPFLM2") + private String wpflm2; + + @TableField("ZLBZH") + private String zlbzh; + + @TableField("WPFLM") + private String wpflm; + + @TableField("TQQXGBS") + private String tqqxgbs; + + @TableField("GYWCBS") + private String gywcbs; + + @TableField("XNJBS") + private String xnjbs; + + @TableField("DHKC") + private Double dhkc; + + @TableField("WPFLM5") + private String wpflm5; + + @TableField("DWJGXGR") + private String dwjgxgr; + + @TableField("SPBM") + private String spbm; + + @TableField("DFKMBM") + private String dfkmbm; + + @TableField("YXZZSJ") + private String yxzzsj; + + @TableField("CPTY") + private Double cpty; + + @TableField("JZMD") + private Double jzmd; + + @TableField("GSDEM") + private String gsdem; + + @TableField("YXYC") + private Double yxyc; + + @TableField("BZJG") + private Double bzjg; + + @TableField("RKBS") + private String rkbs; + + @TableField("ZXPL") + private Double zxpl; + + @TableField("JGBZ") + private String jgbz; + + @TableField("JGWCBS") + private String jgwcbs; + + @TableField("YLZD8") + private String ylzd8; + + @TableField("ABCLX") + private String abclx; + + @TableField("DRJG") + private Double drjg; + + @TableField("ZDRY") + private String zdry; + + @TableField("FGSJ") + private Double fgsj; + + @TableField("GZLX") + private String gzlx; + + @TableField("AQDM") + private String aqdm; + + @TableField("DWJGXGRQ") + private String dwjgxgrq; + + @TableField("CGBZ") + private String cgbz; + + @TableField("WPTPDZ") + private String wptpdz; + + @TableField("CPCS_JLDW") + private String cpcsJldw; + + @TableField("ZJM") + private String zjm; + + @TableField("BSBM") + private String bsbm; + + @TableField("BZ") + private String bz; + + @TableField("XHZL") + private Double xhzl; + + @TableField("WPMC") + private String wpmc; + + @TableField("CCXGRQ") + private String ccxgrq; + + @TableField("YLZD3") + private String ylzd3; + + @TableField("YLZD9") + private String ylzd9; + + @TableField("CKH") + private String ckh; + + @TableField("YLL") + private Double yll; + + @TableField("XJBS") + private String xjbs; + + @TableField("DBZ") + private String dbz; + + @TableField("WPGL") + private String wpgl; + + @TableField("AQKC") + private Double aqkc; + + @TableField("GYLX") + private String gylx; + + @TableField("GYLB") + private String gylb; + + @TableField("BZPL") + private Double bzpl; + + @TableField("WPCC") + private String wpcc; + + @TableField("DJGL_JLDW") + private String djglJldw; + + @TableField("JZ") + private String jz; + + @TableField("PLDM") + private String pldm; + + @TableField("DWJG") + private Double dwjg; + + @TableField("WPFLM3") + private String wpflm3; + + @TableField("WPGG") + private String wpgg; + + @TableField("GYCZRQ") + private String gyczrq; + + @TableField("YLZD6") + private Double ylzd6; + + @TableField("ZZBM") + private String zzbm; + + @TableField("ZDKC") + private Double zdkc; + + @TableField("DCM") + private Double dcm; + + @TableField("WPEMC") + private String wpemc; + + @TableField("GYSBH") + private String gysbh; + + @TableField("PHXS") + private Double phxs; + + @TableField("WPZL") + private Double wpzl; + + @TableField("CPTY_JLDW") + private String cptyJldw; + + @TableField("WD") + private Double wd; + + @TableField("DJDY") + private Double djdy; + + @TableField("JGCZRQ") + private String jgczrq; + + @TableField("YCZJL") + private Double yczjl; + + @TableField("JGWCRQ") + private String jgwcrq; + + @TableField("CFLAG") + private String cflag; + + @TableField("CLDH") + private String cldh; + + @TableField("YLZD1") + private String ylzd1; + + @TableField("YLZD7") + private String ylzd7; + + @TableField("ZDSJ") + private String zdsj; + + @TableField("GDPL") + private Double gdpl; + + @TableField("TZGG") + private String tzgg; + + @TableField("CPLL") + private Double cpll; + + @TableField("CCBS") + private String ccbs; + + @TableField("AQQ") + private Double aqq; + + @TableField("JYBZ") + private String jybz; + + @TableField("BZXX") + private String bzxx; + + @TableField("KCJBS") + private String kcjbs; + + @TableField("CPXL") + private Double cpxl; + + @TableField("ZDRYCG") + private String zdrycg; + + @TableField("XGSJTQ") + private String xgsjtq; + + @TableField("XSJG") + private Double xsjg; + + @TableField("JLDW") + private String jldw; + + @TableField("WPJB") + private String wpjb; + + @TableField("GYWCRQ") + private String gywcrq; + + @TableField("ZTQQXGBS") + private String ztqqxgbs; + + @TableField("YLZD4") + private Double ylzd4; + + +} diff --git a/src/main/java/com/dsic/gj_erp/bean/jcsj/excel/PlExcel.java b/src/main/java/com/dsic/gj_erp/bean/jcsj/excel/PlExcel.java index 55f6de0..de27dfe 100644 --- a/src/main/java/com/dsic/gj_erp/bean/jcsj/excel/PlExcel.java +++ b/src/main/java/com/dsic/gj_erp/bean/jcsj/excel/PlExcel.java @@ -2,10 +2,6 @@ package com.dsic.gj_erp.bean.jcsj.excel; import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.format.DateTimeFormat; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/src/main/java/com/dsic/gj_erp/controller/jcsj/BomUploadController.java b/src/main/java/com/dsic/gj_erp/controller/jcsj/BomUploadController.java new file mode 100644 index 0000000..febbfe0 --- /dev/null +++ b/src/main/java/com/dsic/gj_erp/controller/jcsj/BomUploadController.java @@ -0,0 +1,40 @@ +package com.dsic.gj_erp.controller.jcsj; + +import com.dsic.gj_erp.annotation.AuthFunction; +import com.dsic.gj_erp.bean.ResultBean; +import com.dsic.gj_erp.exception.CustomException; +import com.dsic.gj_erp.service.jcsj.impl.BomUploadServiceImpl; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; + +import javax.servlet.http.HttpServletRequest; + +/** + *

+ * 前端控制器 + *

+ * + * @author xn + * @since 2023-09-11 + */ +@RestController +@RequestMapping("/bom") +public class BomUploadController { + @Autowired + BomUploadServiceImpl bomUploadService; + + + @PostMapping("/uploadBom") + @AuthFunction + @ResponseBody + public ResultBean uploadPl(@RequestParam("file") MultipartFile[] file , String czbh, String isupload, HttpServletRequest req) throws Exception, CustomException { + return bomUploadService.uploadZ( file , czbh, isupload, req); + + + } + + + +} + diff --git a/src/main/java/com/dsic/gj_erp/controller/jcsj/DmBchxjbpController.java b/src/main/java/com/dsic/gj_erp/controller/jcsj/DmBchxjbpController.java new file mode 100644 index 0000000..72677f6 --- /dev/null +++ b/src/main/java/com/dsic/gj_erp/controller/jcsj/DmBchxjbpController.java @@ -0,0 +1,19 @@ +package com.dsic.gj_erp.controller.jcsj; + +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + *

+ * 前端控制器 + *

+ * + * @author xn + * @since 2023-09-20 + */ +@RestController +@RequestMapping("/dmBchxjbp") +public class DmBchxjbpController { + +} + diff --git a/src/main/java/com/dsic/gj_erp/controller/jcsj/DmBchxmxpController.java b/src/main/java/com/dsic/gj_erp/controller/jcsj/DmBchxmxpController.java new file mode 100644 index 0000000..fa925c0 --- /dev/null +++ b/src/main/java/com/dsic/gj_erp/controller/jcsj/DmBchxmxpController.java @@ -0,0 +1,37 @@ +package com.dsic.gj_erp.controller.jcsj; + +import com.dsic.gj_erp.bean.ResultBean; +import com.dsic.gj_erp.bean.jcsj.DmBchxmxp; +import com.dsic.gj_erp.exception.CustomException; +import com.dsic.gj_erp.service.jcsj.DmBchxmxpService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletRequest; +import java.util.List; +import java.util.Map; + +/** + *

+ * 前端控制器 套料图 + *

+ * + * @author xn + * @since 2023-09-20 + */ +@RestController +@RequestMapping("/dmBchxmxp") +public class DmBchxmxpController { + + @Autowired + DmBchxmxpService dmBchxmxpService; + + @PostMapping("/getTLTList") + @ResponseBody + public ResultBean getBcTJlList(HttpServletRequest req, @RequestBody Map map) throws Exception, CustomException { + List getTLTList = dmBchxmxpService.getTLTList(map); + return new ResultBean(getTLTList); + + } +} + diff --git a/src/main/java/com/dsic/gj_erp/controller/jcsj/DmBchxylpController.java b/src/main/java/com/dsic/gj_erp/controller/jcsj/DmBchxylpController.java new file mode 100644 index 0000000..6b6753e --- /dev/null +++ b/src/main/java/com/dsic/gj_erp/controller/jcsj/DmBchxylpController.java @@ -0,0 +1,35 @@ +package com.dsic.gj_erp.controller.jcsj; + +import com.dsic.gj_erp.bean.ResultBean; +import com.dsic.gj_erp.bean.jcsj.DmBchxylp; +import com.dsic.gj_erp.exception.CustomException; +import com.dsic.gj_erp.service.jcsj.DmBchxylpService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletRequest; +import java.util.List; +import java.util.Map; + +/** + *

+ * 前端控制器 + *

+ * + * @author xn + * @since 2023-09-19 + */ +@RestController +@RequestMapping("/dmBchxylp") +public class DmBchxylpController { + @Autowired + DmBchxylpService dmBchxylpService; + @PostMapping("/getBcTJlList") + @ResponseBody + public ResultBean getBcTJlList(HttpServletRequest req, @RequestBody Map map) throws Exception, CustomException { + List bcLQlList = dmBchxylpService.getBcTJlList(map); + return new ResultBean(bcLQlList); + + } +} + diff --git a/src/main/java/com/dsic/gj_erp/controller/jcsj/DmBclqjbpController.java b/src/main/java/com/dsic/gj_erp/controller/jcsj/DmBclqjbpController.java new file mode 100644 index 0000000..45d220b --- /dev/null +++ b/src/main/java/com/dsic/gj_erp/controller/jcsj/DmBclqjbpController.java @@ -0,0 +1,19 @@ +package com.dsic.gj_erp.controller.jcsj; + +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + *

+ * 前端控制器 + *

+ * + * @author xn + * @since 2023-09-15 + */ +@RestController +@RequestMapping("/dmBclqjbp") +public class DmBclqjbpController { + +} + diff --git a/src/main/java/com/dsic/gj_erp/controller/jcsj/DmBclqmxpController.java b/src/main/java/com/dsic/gj_erp/controller/jcsj/DmBclqmxpController.java new file mode 100644 index 0000000..50e0115 --- /dev/null +++ b/src/main/java/com/dsic/gj_erp/controller/jcsj/DmBclqmxpController.java @@ -0,0 +1,38 @@ +package com.dsic.gj_erp.controller.jcsj; + + +import com.dsic.gj_erp.bean.ResultBean; +import com.dsic.gj_erp.bean.jcsj.DmBclqmxp; +import com.dsic.gj_erp.exception.CustomException; +import com.dsic.gj_erp.service.jcsj.DmBclqmxpService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletRequest; +import java.util.List; +import java.util.Map; + +/** + *

+ * 前端控制器 + *

+ * + * @author xn + * @since 2023-09-15 + */ +@RestController +@RequestMapping("/dmBclqmxp") +public class DmBclqmxpController { + + @Autowired + DmBclqmxpService dmBclqmxpService; + @PostMapping("/getBcLQlList") + @ResponseBody + public ResultBean getBcLQlList(HttpServletRequest req, @RequestBody Map map) throws Exception, CustomException { + List bcLQlList = dmBclqmxpService.getBcLQlList(map); + return new ResultBean(bcLQlList); + + } + +} + diff --git a/src/main/java/com/dsic/gj_erp/controller/jcsj/DmBomController.java b/src/main/java/com/dsic/gj_erp/controller/jcsj/DmBomController.java new file mode 100644 index 0000000..670b6c8 --- /dev/null +++ b/src/main/java/com/dsic/gj_erp/controller/jcsj/DmBomController.java @@ -0,0 +1,61 @@ +package com.dsic.gj_erp.controller.jcsj; + +import com.dsic.gj_erp.annotation.AuthFunction; +import com.dsic.gj_erp.bean.ResultBean; +import com.dsic.gj_erp.bean.jcsj.DmBom; +import com.dsic.gj_erp.exception.CustomException; +import com.dsic.gj_erp.service.jcsj.DmBomService; +import com.dsic.gj_erp.service.jcsj.impl.BomUploadServiceImpl; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletRequest; +import java.util.List; +import java.util.Map; + +/** + *

+ * 前端控制器 + *

+ * + * @author xn + * @since 2023-09-25 + */ +@RestController +@RequestMapping("/dmBom") +public class DmBomController { + + @Autowired + DmBomService dmBomService; + + @Autowired + BomUploadServiceImpl bomUploadService; + + @PostMapping("/getListBom") + public ResultBean getListBom(HttpServletRequest req, @RequestBody Map map) throws CustomException { + List listBom = dmBomService.getListBom(map); + return new ResultBean(listBom); + } + + @PostMapping("/addListBom") + @AuthFunction + public ResultBean addListBom(HttpServletRequest req, @RequestBody Map map) throws CustomException { + List dmBoms = bomUploadService.insertBom(req,(String) map.get("dcch"), (String) map.get("dcpl")); +// dmBomService.insertBoms(dmBoms); + return new ResultBean(dmBoms); + } + + + @PostMapping("/saveListBom") + public ResultBean saveListBom(HttpServletRequest req, @RequestBody List list) throws CustomException { + dmBomService.insertBoms(list); +// + return new ResultBean(); +// return null; + } + +} + diff --git a/src/main/java/com/dsic/gj_erp/controller/jcsj/DmCbxxpController.java b/src/main/java/com/dsic/gj_erp/controller/jcsj/DmCbxxpController.java index 978a640..de4f573 100644 --- a/src/main/java/com/dsic/gj_erp/controller/jcsj/DmCbxxpController.java +++ b/src/main/java/com/dsic/gj_erp/controller/jcsj/DmCbxxpController.java @@ -1,23 +1,15 @@ package com.dsic.gj_erp.controller.jcsj; - -import cn.hutool.core.date.DateUtil; -import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.dsic.gj_erp.annotation.AuthFunction; import com.dsic.gj_erp.bean.ResultBean; import com.dsic.gj_erp.bean.jcsj.DmCbxxp; import com.dsic.gj_erp.service.jcsj.DmCbxxpService; -import io.swagger.annotations.Api; -import io.swagger.annotations.Authorization; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; - import org.springframework.web.bind.annotation.RestController; + import javax.servlet.http.HttpServletRequest; import java.util.List; import java.util.Map; diff --git a/src/main/java/com/dsic/gj_erp/controller/jcsj/DmCzplpController.java b/src/main/java/com/dsic/gj_erp/controller/jcsj/DmCzplpController.java index 7c3b09e..fb5b9f8 100644 --- a/src/main/java/com/dsic/gj_erp/controller/jcsj/DmCzplpController.java +++ b/src/main/java/com/dsic/gj_erp/controller/jcsj/DmCzplpController.java @@ -1,8 +1,6 @@ package com.dsic.gj_erp.controller.jcsj; - import org.springframework.web.bind.annotation.RequestMapping; - import org.springframework.web.bind.annotation.RestController; /** diff --git a/src/main/java/com/dsic/gj_erp/controller/jcsj/DmCzplpNewController.java b/src/main/java/com/dsic/gj_erp/controller/jcsj/DmCzplpNewController.java index 9333dfe..8a06bb2 100644 --- a/src/main/java/com/dsic/gj_erp/controller/jcsj/DmCzplpNewController.java +++ b/src/main/java/com/dsic/gj_erp/controller/jcsj/DmCzplpNewController.java @@ -9,8 +9,6 @@ import com.dsic.gj_erp.bean.jcsj.excel.PlExcel; import com.dsic.gj_erp.exception.CustomException; import com.dsic.gj_erp.listeners.ExcelPlListener; import com.dsic.gj_erp.service.jcsj.DmCzplpNewService; -import com.dsic.gj_erp.service.jcsj.DmCzplpService; -import io.swagger.annotations.Authorization; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; diff --git a/src/main/java/com/dsic/gj_erp/controller/jcsj/DmWlqdController.java b/src/main/java/com/dsic/gj_erp/controller/jcsj/DmWlqdController.java new file mode 100644 index 0000000..193eb23 --- /dev/null +++ b/src/main/java/com/dsic/gj_erp/controller/jcsj/DmWlqdController.java @@ -0,0 +1,38 @@ +package com.dsic.gj_erp.controller.jcsj; + +import com.dsic.gj_erp.bean.ResultBean; +import com.dsic.gj_erp.bean.jcsj.DmWlqd; +import com.dsic.gj_erp.exception.CustomException; +import com.dsic.gj_erp.service.jcsj.DmWlqdService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletRequest; +import java.util.List; +import java.util.Map; + +/** + *

+ * 前端控制器 + *

+ * + * @author xn + * @since 2023-09-21 + */ +@RestController +@RequestMapping("/dmWlqd") +public class DmWlqdController { + + @Autowired + DmWlqdService dmWlqdService; + + @PostMapping("/getLJQDList") + @ResponseBody + public ResultBean getLJQDList(HttpServletRequest req, @RequestBody Map map) throws Exception, CustomException { + List getTLTList = dmWlqdService.getLJQDList(map); + return new ResultBean(getTLTList); + + } + +} + diff --git a/src/main/java/com/dsic/gj_erp/controller/jcsj/DmWpjbpController.java b/src/main/java/com/dsic/gj_erp/controller/jcsj/DmWpjbpController.java new file mode 100644 index 0000000..aaab622 --- /dev/null +++ b/src/main/java/com/dsic/gj_erp/controller/jcsj/DmWpjbpController.java @@ -0,0 +1,19 @@ +package com.dsic.gj_erp.controller.jcsj; + +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + *

+ * 前端控制器 + *

+ * + * @author xn + * @since 2023-09-21 + */ +@RestController +@RequestMapping("/dmWpjbp") +public class DmWpjbpController { + +} + diff --git a/src/main/java/com/dsic/gj_erp/dao/sy/Dm_zhbmpRepository.java b/src/main/java/com/dsic/gj_erp/dao/sy/Dm_zhbmpRepository.java index 4882b16..b1ba276 100644 --- a/src/main/java/com/dsic/gj_erp/dao/sy/Dm_zhbmpRepository.java +++ b/src/main/java/com/dsic/gj_erp/dao/sy/Dm_zhbmpRepository.java @@ -20,7 +20,7 @@ public interface Dm_zhbmpRepository extends JpaRepository findByBMLB(String bmlb); Dm_zhbmp findByBMLBAndBM(String bmlb,String bm); - + Dm_zhbmp findByBMLBAndBmsm(String bmlb,String bmsm); @Query(nativeQuery = true,value = "select bm as dwbm,bmsm as dwmc from dm_zhbmp where BMLB='BMBM' and (left(bm,3)='023' ) and isnull(ylzd3,'N')='D'") List 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' ") diff --git a/src/main/java/com/dsic/gj_erp/mapper/jcsj/DmBchxjbpMapper.java b/src/main/java/com/dsic/gj_erp/mapper/jcsj/DmBchxjbpMapper.java new file mode 100644 index 0000000..b6b7bac --- /dev/null +++ b/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; + +/** + *

+ * Mapper 接口 + *

+ * + * @author xn + * @since 2023-09-20 + */ +public interface DmBchxjbpMapper extends BaseMapper { + +} diff --git a/src/main/java/com/dsic/gj_erp/mapper/jcsj/DmBchxmxpMapper.java b/src/main/java/com/dsic/gj_erp/mapper/jcsj/DmBchxmxpMapper.java new file mode 100644 index 0000000..3cfb2bc --- /dev/null +++ b/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; + +/** + *

+ * Mapper 接口 + *

+ * + * @author xn + * @since 2023-09-20 + */ +public interface DmBchxmxpMapper extends BaseMapper { + + void updateWpgg(@Param("dcch")String dcch, @Param("dcpl")String dcpl); + void updateWph(@Param("dcch")String dcch,@Param("dcpl")String dcpl); + List getTLTList(Map map); + +} diff --git a/src/main/java/com/dsic/gj_erp/mapper/jcsj/DmBchxylpMapper.java b/src/main/java/com/dsic/gj_erp/mapper/jcsj/DmBchxylpMapper.java new file mode 100644 index 0000000..1ff96e1 --- /dev/null +++ b/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; + +/** + *

+ * Mapper 接口 + *

+ * + * @author xn + * @since 2023-09-19 + */ +public interface DmBchxylpMapper extends BaseMapper { + + + public List getBcTJlList(Map map); + +} diff --git a/src/main/java/com/dsic/gj_erp/mapper/jcsj/DmBclqjbpMapper.java b/src/main/java/com/dsic/gj_erp/mapper/jcsj/DmBclqjbpMapper.java new file mode 100644 index 0000000..66abb7c --- /dev/null +++ b/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; + +/** + *

+ * Mapper 接口 + *

+ * + * @author xn + * @since 2023-09-15 + */ +public interface DmBclqjbpMapper extends BaseMapper { + +} diff --git a/src/main/java/com/dsic/gj_erp/mapper/jcsj/DmBclqmxpMapper.java b/src/main/java/com/dsic/gj_erp/mapper/jcsj/DmBclqmxpMapper.java new file mode 100644 index 0000000..91fd865 --- /dev/null +++ b/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; + +/** + *

+ * Mapper 接口 + *

+ * + * @author xn + * @since 2023-09-15 + */ +public interface DmBclqmxpMapper extends BaseMapper { + + + public List getBcLQlList(Map map); + +} diff --git a/src/main/java/com/dsic/gj_erp/mapper/jcsj/DmBomMapper.java b/src/main/java/com/dsic/gj_erp/mapper/jcsj/DmBomMapper.java new file mode 100644 index 0000000..d2677ee --- /dev/null +++ b/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; + +/** + *

+ * Mapper 接口 + *

+ * + * @author xn + * @since 2023-09-25 + */ +public interface DmBomMapper extends BaseMapper { + + + int insertBoms(List dmMfgDetails); + int insertBom(DmBom dmMfgDetails); + +} diff --git a/src/main/java/com/dsic/gj_erp/mapper/jcsj/DmCbxxpMapper.java b/src/main/java/com/dsic/gj_erp/mapper/jcsj/DmCbxxpMapper.java index d3a3d80..1318a51 100644 --- a/src/main/java/com/dsic/gj_erp/mapper/jcsj/DmCbxxpMapper.java +++ b/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; /** diff --git a/src/main/java/com/dsic/gj_erp/mapper/jcsj/DmCzplpMapper.java b/src/main/java/com/dsic/gj_erp/mapper/jcsj/DmCzplpMapper.java index f0b4fe9..bc7e126 100644 --- a/src/main/java/com/dsic/gj_erp/mapper/jcsj/DmCzplpMapper.java +++ b/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; /** *

diff --git a/src/main/java/com/dsic/gj_erp/mapper/jcsj/DmCzplpNewMapper.java b/src/main/java/com/dsic/gj_erp/mapper/jcsj/DmCzplpNewMapper.java index 2e40305..bb645dd 100644 --- a/src/main/java/com/dsic/gj_erp/mapper/jcsj/DmCzplpNewMapper.java +++ b/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; /** *

diff --git a/src/main/java/com/dsic/gj_erp/mapper/jcsj/DmWlqdMapper.java b/src/main/java/com/dsic/gj_erp/mapper/jcsj/DmWlqdMapper.java new file mode 100644 index 0000000..bf661e6 --- /dev/null +++ b/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; + +/** + *

+ * Mapper 接口 + *

+ * + * @author xn + * @since 2023-09-21 + */ +public interface DmWlqdMapper extends BaseMapper { + + List getLJQDList(Map map); + +} diff --git a/src/main/java/com/dsic/gj_erp/mapper/jcsj/DmWpjbpMapper.java b/src/main/java/com/dsic/gj_erp/mapper/jcsj/DmWpjbpMapper.java new file mode 100644 index 0000000..d851f08 --- /dev/null +++ b/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; + +/** + *

+ * Mapper 接口 + *

+ * + * @author xn + * @since 2023-09-21 + */ +public interface DmWpjbpMapper extends BaseMapper { + +} diff --git a/src/main/java/com/dsic/gj_erp/service/jcsj/DmBchxjbpService.java b/src/main/java/com/dsic/gj_erp/service/jcsj/DmBchxjbpService.java new file mode 100644 index 0000000..0a65c29 --- /dev/null +++ b/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; + +/** + *

+ * 服务类 + *

+ * + * @author xn + * @since 2023-09-20 + */ +public interface DmBchxjbpService extends IService { + + + +} diff --git a/src/main/java/com/dsic/gj_erp/service/jcsj/DmBchxmxpService.java b/src/main/java/com/dsic/gj_erp/service/jcsj/DmBchxmxpService.java new file mode 100644 index 0000000..15ca8ee --- /dev/null +++ b/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; + +/** + *

+ * 服务类 + *

+ * + * @author xn + * @since 2023-09-20 + */ +public interface DmBchxmxpService extends IService { + + List getTLTList(Map map); + +} diff --git a/src/main/java/com/dsic/gj_erp/service/jcsj/DmBchxylpService.java b/src/main/java/com/dsic/gj_erp/service/jcsj/DmBchxylpService.java new file mode 100644 index 0000000..cf47719 --- /dev/null +++ b/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; + +/** + *

+ * 服务类 + *

+ * + * @author xn + * @since 2023-09-19 + */ +public interface DmBchxylpService extends IService { + + ListgetBcTJlList(Map map); + +} diff --git a/src/main/java/com/dsic/gj_erp/service/jcsj/DmBclqjbpService.java b/src/main/java/com/dsic/gj_erp/service/jcsj/DmBclqjbpService.java new file mode 100644 index 0000000..8e002ba --- /dev/null +++ b/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; + +/** + *

+ * 服务类 + *

+ * + * @author xn + * @since 2023-09-15 + */ +public interface DmBclqjbpService extends IService { + +} diff --git a/src/main/java/com/dsic/gj_erp/service/jcsj/DmBclqmxpService.java b/src/main/java/com/dsic/gj_erp/service/jcsj/DmBclqmxpService.java new file mode 100644 index 0000000..775cb50 --- /dev/null +++ b/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; + +/** + *

+ * 服务类 + *

+ * + * @author xn + * @since 2023-09-15 + */ +public interface DmBclqmxpService extends IService { + + ListgetBcLQlList(Map map); + +} diff --git a/src/main/java/com/dsic/gj_erp/service/jcsj/DmBomService.java b/src/main/java/com/dsic/gj_erp/service/jcsj/DmBomService.java new file mode 100644 index 0000000..99560b5 --- /dev/null +++ b/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; + +/** + *

+ * 服务类 + *

+ * + * @author xn + * @since 2023-09-25 + */ +public interface DmBomService extends IService { + + + ListgetListBom(Map map) throws CustomException; + void insertBoms(List map) throws CustomException; + +} diff --git a/src/main/java/com/dsic/gj_erp/service/jcsj/DmCbxxpService.java b/src/main/java/com/dsic/gj_erp/service/jcsj/DmCbxxpService.java index 94f219d..4a15bd4 100644 --- a/src/main/java/com/dsic/gj_erp/service/jcsj/DmCbxxpService.java +++ b/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; diff --git a/src/main/java/com/dsic/gj_erp/service/jcsj/DmCzplpNewService.java b/src/main/java/com/dsic/gj_erp/service/jcsj/DmCzplpNewService.java index 075b8b7..8034f65 100644 --- a/src/main/java/com/dsic/gj_erp/service/jcsj/DmCzplpNewService.java +++ b/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; diff --git a/src/main/java/com/dsic/gj_erp/service/jcsj/DmCzplpService.java b/src/main/java/com/dsic/gj_erp/service/jcsj/DmCzplpService.java index 3a6fc07..7dd1ec2 100644 --- a/src/main/java/com/dsic/gj_erp/service/jcsj/DmCzplpService.java +++ b/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; /** *

diff --git a/src/main/java/com/dsic/gj_erp/service/jcsj/DmWlqdService.java b/src/main/java/com/dsic/gj_erp/service/jcsj/DmWlqdService.java new file mode 100644 index 0000000..aa6c527 --- /dev/null +++ b/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; + +/** + *

+ * 服务类 + *

+ * + * @author xn + * @since 2023-09-21 + */ +public interface DmWlqdService extends IService { + + List getLJQDList(Map map); + +} diff --git a/src/main/java/com/dsic/gj_erp/service/jcsj/DmWpjbpService.java b/src/main/java/com/dsic/gj_erp/service/jcsj/DmWpjbpService.java new file mode 100644 index 0000000..4fea7c3 --- /dev/null +++ b/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; + +/** + *

+ * 服务类 + *

+ * + * @author xn + * @since 2023-09-21 + */ +public interface DmWpjbpService extends IService { + +} diff --git a/src/main/java/com/dsic/gj_erp/service/jcsj/impl/BomUploadServiceImpl.java b/src/main/java/com/dsic/gj_erp/service/jcsj/impl/BomUploadServiceImpl.java new file mode 100644 index 0000000..0ebac09 --- /dev/null +++ b/src/main/java/com/dsic/gj_erp/service/jcsj/impl/BomUploadServiceImpl.java @@ -0,0 +1,1313 @@ +package com.dsic.gj_erp.service.jcsj.impl; + +import cn.hutool.core.date.DateUtil; +import cn.hutool.core.io.FileUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; +import com.dsic.gj_erp.bean.ResultBean; +import com.dsic.gj_erp.bean.jcsj.*; +import com.dsic.gj_erp.bean.jhgk.DmTzjh; +import com.dsic.gj_erp.bean.sy.Dm_zhbmp; +import com.dsic.gj_erp.dao.sy.Dm_zhbmpRepository; +import com.dsic.gj_erp.exception.CustomException; +import com.dsic.gj_erp.mapper.jcsj.DmBchxmxpMapper; +import com.dsic.gj_erp.service.jcsj.*; +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; +import org.springframework.stereotype.Service; +import org.springframework.web.multipart.MultipartFile; + +import javax.script.ScriptException; +import javax.servlet.http.HttpServletRequest; +import java.io.File; +import java.io.IOException; +import java.io.InputStream; +import java.math.BigDecimal; +import java.util.*; +import java.util.stream.Collectors; + +/** + *

+ * 服务实现类 + *

+ * + * @author xn + * @since 2023-09-11 + */ +@Service +public class BomUploadServiceImpl { + private static String dezt; + @Autowired + DmCbxxpService dmCbxxpService; + @Autowired + Dm_zhbmpRepository dm_zhbmpRepository; + @Autowired + DmBclqmxpService bclqmxpService; + @Autowired + DmBclqjbpService bclqjbpService; + @Autowired + SYService syService; + @Autowired + DmBchxylpService bchxylpService; + @Autowired + DmBchxjbpService bchxjbpService; + @Autowired + DmBchxmxpService bchxmxpService; + @Autowired + DmWlqdService wlqdService; + @Autowired + DmBchxmxpMapper dmBchxmxpMapper; + @Autowired + DmWpjbpService dmWpjbpServicel; + @Autowired + DmCzplpNewService dmCzplpNewService; + @Autowired + DmTzjhService dmTzjhService; + + @Autowired + DmBomService dmBomService; + + public synchronized ResultBean uploadZ(MultipartFile[] file, String czbh, String isupload, HttpServletRequest req) throws IOException, CustomException, ScriptException { + String savePath = UUID.randomUUID().toString().replace("-", ""); + //dezt="00"; + File destFile = null; +// int del=1; + int bcdel = 1; + int xcdel = 1; + int bctjdel = 1; + int xctjdel = 1; + int tld = 1; + int ldpt = 1; + String czbh1=""; + String pl=""; + for (MultipartFile f : file) { + String fname = f.getOriginalFilename(); + ; + fname= fname.substring(fname.lastIndexOf('/') + 1); + System.out.println(f.getOriginalFilename()); + destFile = FileUtil.file(savePath, fname); + try (InputStream inputStream = f.getInputStream()) { + FileUtil.writeFromStream(inputStream, destFile); + } + List lines = FileUtil.readLines(destFile, "GBK"); + lines.forEach(e -> { + System.out.println("lines = " + e); + }); + // String delzt="00"; + + if (fname.contains("板材领取表")) { + Map map = this.bclqbUpload(lines, fname, req, isupload, bcdel); + bcdel++; + int indexOfUnderscore = fname.indexOf('_'); + + czbh1 = fname.substring(0, indexOfUnderscore); + // 2. 第一个_后面批前面的字符 + int indexOfSecondUnderscore = fname.lastIndexOf('_'); + + pl = fname.substring(indexOfUnderscore + 1, fname.lastIndexOf('批')); + if (map.get("zt").equals("02")) { + return new ResultBean(map); + } + } + if (fname.contains("型材领取表")) { + Map map = this.xclqbUpload(lines, fname, req, isupload, xcdel); + xcdel++; + int indexOfUnderscore = fname.indexOf('_'); + + czbh1 = fname.substring(0, indexOfUnderscore); + // 2. 第一个_后面批前面的字符 + int indexOfSecondUnderscore = fname.lastIndexOf('_'); + + pl = fname.substring(indexOfUnderscore + 1, fname.lastIndexOf('批')); + if (map.get("zt").equals("02")) { + return new ResultBean(map); + } + } + if (fname.contains("板材统计数据")) { + Map map = this.bctjUpload(lines, fname, req, isupload, bctjdel); + bctjdel++; + int indexOfUnderscore = fname.indexOf('_'); + + czbh1 = fname.substring(0, indexOfUnderscore); + // 2. 第一个_后面批前面的字符 + int indexOfSecondUnderscore = fname.lastIndexOf('_'); + + pl = fname.substring(indexOfUnderscore + 1, fname.lastIndexOf('批')); + if (map.get("zt").equals("02")) { + return new ResultBean(map); + } + } + if (fname.contains("型材统计数据")) { + Map map = this.xctjUpload(lines, fname, req, isupload, xctjdel); + xctjdel++; + int indexOfUnderscore = fname.indexOf('_'); + + czbh1 = fname.substring(0, indexOfUnderscore); + // 2. 第一个_后面批前面的字符 + int indexOfSecondUnderscore = fname.lastIndexOf('_'); + + pl = fname.substring(indexOfUnderscore + 1, fname.lastIndexOf('批')); + if (map.get("zt").equals("02")) { + return new ResultBean(map); + } + } + + if (fname.contains("套料图")) { + Map map = this.bctltUpload(lines, fname, req, isupload, tld); + tld++; + int indexOfUnderscore = fname.indexOf('_'); + + czbh1 = fname.substring(0, indexOfUnderscore); + // 2. 第一个_后面批前面的字符 + int indexOfSecondUnderscore = fname.lastIndexOf('_'); + + pl = fname.substring(indexOfUnderscore + 1, fname.lastIndexOf('套')); + if (map.get("zt").equals("02")) { + return new ResultBean(map); + } + } + if (this.ssum(fname, '-') == 3) { + Map map = this.ljptbUpload(lines, fname, req, isupload, ldpt); + ldpt++; + int firstDashIndex = fname.indexOf("-"); + if (firstDashIndex != -1) { + // 找到第二个短划线的位置，从第一个短划线的下一个位置开始搜索 + int secondDashIndex = fname.indexOf("-", firstDashIndex + 1); + if (secondDashIndex != -1) { + // 使用 substring 方法拆分字符串 + czbh = fname.substring(0, secondDashIndex); + pl = fname.substring(secondDashIndex + 1).split("-")[0]; + } + } + if (map.get("zt").equals("02")) { + return new ResultBean(map); + } + } +// del++; + } + FileUtil.del(new File(savePath)); + List dmBoms = this.insertBom( req,czbh1, pl); + Map map =new HashMap(); + map.put("zt","01"); + map.put("data",dmBoms); + return new ResultBean(map); + } + + /** + * 板材领取表导入 + * + * @param lines + * @param fileName zt 默认传 01 如果 传02 说明二次导入 // todo （dm_czplp_new ：jsq_lqb）、《图纸计划》（dm_tzjh ：jsq_lqb） + * // 根据船号 ，pi量全部删除 型材是否 插入 物品基本表 + */ + public Map bclqbUpload(List lines, String fileName, HttpServletRequest req, String zt, int bcdel) throws CustomException { + // 判断是否重复导入 + Map map = new HashMap(); + String id = syService.f_getpjh("DM", "SYSTEM", "CLDE"); + String lqlb = ""; + String onebc = lines.get(0); + String[] splitOne = onebc.split(","); + DmBclqjbp bclqjbp = new DmBclqjbp(); + bclqjbp.setZdr((String) req.getAttribute("yhms")); + bclqjbp.setZdrq(DateUtil.format(DateUtil.date(), "yyyy/MM/dd")); + bclqjbp.setDerq(DateUtil.format(DateUtil.date(), "yyyy/MM/dd")); + bclqjbp.setDelx("B"); + if (fileName.contains("数控")) { + bclqjbp.setLqlb("1020"); + } else { + bclqjbp.setLqlb("1010"); // 手工 + } + bclqjbp.setDcCh(splitOne[0]); + bclqjbp.setDcFd(splitOne[1]); + bclqjbp.setDcPl(splitOne[2]); +// DmCbxxp cbbm = dmCbxxpService.getOne(new QueryWrapper().eq("cbbm", splitOne[0])); +// if(cbbm.getXbz().equals("Y") && fileName.contains("跨")){ +// +// } + // 得到第几跨 C16K-2_011批数控板材领取表(中大组立)_4跨普通板.bc 4跨普通板 + int lastUnderscoreIndex = fileName.lastIndexOf("_"); + // 找到最后一个 "." 的位置 + int lastDotIndex = fileName.lastIndexOf("."); + if (lastUnderscoreIndex != -1 && lastDotIndex != -1 && lastDotIndex > lastUnderscoreIndex) { + String result = fileName.substring(lastUnderscoreIndex + 1, lastDotIndex); + Dm_zhbmp qgkw = dm_zhbmpRepository.findByBMLBAndBmsm("QGKW", result); + if (null == qgkw) { + throw new CustomException(10106, result + "跨位信息不存在"); + } + bclqjbp.setZzcj(qgkw.getBM()); + } else { + System.out.println("没有跨位信息"); + } + bclqjbp.setYbzs(new BigDecimal(splitOne[3])); + bclqjbp.setLqzl(new BigDecimal(splitOne[4])); + bclqjbp.setShzl(new BigDecimal(splitOne[5])); + bclqjbp.setYlzl(new BigDecimal(splitOne[6])); + bclqjbp.setQpyld(new BigDecimal(splitOne[7])); + bclqjbp.setLqbh(id); + String mc = splitOne[8].replace("組", "组"); + Dm_zhbmp zllb = dm_zhbmpRepository.findByBMLBAndBmsm("ZLLB", mc); + if (null == zllb) { + throw new CustomException(10104, "请查看板材领取表组立信息"); + } else { + bclqjbp.setDcZl(zllb.getBM()); + } + int cs = 0; +// List bclqmxpListOld = bclqmxpService.list(new QueryWrapper().eq("DC_CH_z", bclqjbp.getDcCh()) +// .eq("DC_ZL_z", bclqjbp.getDcZl()).eq("DC_PL_z", bclqjbp.getDcPl()).eq("DELX_z", "B") +// .eq("LQLB_z", bclqjbp.getLqlb()).eq("ZZCJ_z", bclqjbp.getZzcj())); + List bclqmxpListOld = bclqmxpService.list(new QueryWrapper().eq("DC_CH_z", bclqjbp.getDcCh()) + .eq("DC_PL_z", bclqjbp.getDcPl()).eq("DELX_z", "B") + ); + if (bclqmxpListOld.size() > 0 && "01".equals(zt)) { + // 提示是否覆盖 + map.put("zt", "02"); + return map; + } else if ("02".equals(zt) && bcdel == 1) { +// bclqmxpService.remove(new QueryWrapper().eq("DC_CH_z", bclqjbp.getDcCh()) +// .eq("DC_ZL_z", bclqjbp.getDcZl()).eq("DC_PL_z", bclqjbp.getDcPl()).eq("DELX_z", "B") +// .eq("LQLB_z", bclqjbp.getLqlb()).eq("ZZCJ_z", bclqjbp.getZzcj())); +// bclqjbpService.remove(new QueryWrapper().eq("DC_CH", bclqjbp.getDcCh()) +// .eq("dc_zl", bclqjbp.getDcZl()).eq("dc_pl", bclqjbp.getDcPl()).eq("delx", "B") +// .eq("lqlb", bclqjbp.getLqlb()).eq("zzcj", bclqjbp.getZzcj())); + bclqmxpService.remove(new QueryWrapper().eq("DC_CH_z", bclqjbp.getDcCh()). + eq("DC_PL_z", bclqjbp.getDcPl()).eq("DELX_z", "B") + ); + bclqjbpService.remove(new QueryWrapper().eq("DC_CH", bclqjbp.getDcCh()) + .eq("dc_pl", bclqjbp.getDcPl()).eq("delx", "B") + ); + dezt = "01"; + if (bclqmxpListOld.size() <= 0) { + } else { + cs = bclqmxpListOld.get(0).getDrcs(); + } + map.put("zt", "01"); + } else { + map.put("zt", "01"); + } + //明细部分 + int hh = Integer.valueOf(lines.get(1)); + double xh = 1; + List addmx = new ArrayList<>(); + for (int i = 2; i < hh + 2; i++) { + String bcxx = lines.get(i); + String[] bcxxs = bcxx.split(","); + DmBclqmxp bclqmxp = new DmBclqmxp(); + bclqmxp.setXh(new BigDecimal(xh + "")); + bclqmxp.setWpgg(bcxxs[0]); + bclqmxp.setSl(new BigDecimal(StringUtils.isBlank(bcxxs[1]) ? "0" : bcxxs[1])); + bclqmxp.setWpxh(bcxxs[2]); + bclqmxp.setLqzl(new BigDecimal(StringUtils.isBlank(bcxxs[3]) ? "0" : bcxxs[3])); + bclqmxp.setShzl(new BigDecimal(StringUtils.isBlank(bcxxs[4]) ? "0" : bcxxs[4])); + bclqmxp.setYlzl(new BigDecimal(StringUtils.isBlank(bcxxs[5]) ? "0" : bcxxs[5])); + bclqmxp.setQpyld(new BigDecimal(StringUtils.isBlank(bcxxs[6]) ? "0" : bcxxs[6])); + bclqmxp.setLjzl(new BigDecimal(StringUtils.isBlank(bcxxs[7]) ? "0" : bcxxs[7])); + bclqmxp.setLqlbZ(bclqjbp.getLqlb()); + bclqmxp.setDcPlZ(bclqjbp.getDcPl()); + bclqmxp.setDcZlZ(bclqjbp.getDcZl()); + bclqmxp.setDcChZ(bclqjbp.getDcCh()); + bclqmxp.setDcFdZ(bclqjbp.getDcFd()); + bclqmxp.setDelxZ(bclqjbp.getDelx()); + bclqmxp.setDerqZ(bclqjbp.getDerq()); + bclqmxp.setYbzsZ(bclqjbp.getYbzs()); + bclqmxp.setLqzlZ(bclqjbp.getLqzl()); + bclqmxp.setShzlZ(bclqjbp.getShzl()); + bclqmxp.setYlzlZ(bclqjbp.getYlzl()); + bclqmxp.setQpyldZ(bclqjbp.getQpyld()); +// bclqmxp.setZxdwZ(); +// bclqmxp.setLqmjZ(); +// bclqmxp.setCjdqZ(); +// bclqmxp.setXlZ(); + bclqmxp.setZdrZ(bclqjbp.getZdr()); + bclqmxp.setZdrqZ(bclqjbp.getZdrq()); +// bclqmxp.setJsmsZ(); +// bclqmxp.setShmsZ(); + bclqmxp.setLjzlZ(bclqjbp.getLjzl()); + bclqmxp.setZzcjZ(bclqjbp.getZzcj()); + bclqmxp.setDrcs(cs + 1); +// bclqmxp.setYlzd12(); +// +// +// bclqmxp.setYlzd9(); +// bclqmxp.setYlzd10(); +// +// bclqmxp.setYlzd7(); +// +// bclqmxp.setYlzd8(); +// bclqmxp.setSysl(); + bclqmxp.setLqbh(bclqjbp.getLqbh()); + xh++; + addmx.add(bclqmxp); + } + if (addmx.size() > 0) { + bclqmxpService.saveBatch(addmx); + } + addmx.forEach(e -> { + String[] s = e.getDcFdZ().split(" "); + for (String fd : s) { + UpdateWrapper qw = new UpdateWrapper<>(); + qw.set("jsq_lqb", DateUtil.format(DateUtil.date(), "yyyy/MM/dd")); + qw.eq("dc_ch", e.getDcChZ()); + qw.eq("dc_pl", e.getDcPlZ()); + qw.eq("dc_fd", fd); + dmCzplpNewService.update(qw); + UpdateWrapper qw1 = new UpdateWrapper<>(); + qw1.set("jsq_lqb", DateUtil.format(DateUtil.date(), "yyyy/MM/dd")); + qw1.eq("dc_ch", e.getDcChZ()); + qw1.eq("dc_pl", e.getDcPlZ()); + qw1.eq("dc_fd", fd); + dmTzjhService.update(qw1); + } + }); + bclqjbpService.save(bclqjbp); + return map; + } + + public Map xclqbUpload(List lines, String fileName, HttpServletRequest req, String zt, int xcdel) throws CustomException { + // 判断是否重复导入 + Map map = new HashMap(); + String id = syService.f_getpjh("DM", "SYSTEM", "CLDE"); + String lqlb = ""; + String onebc = lines.get(0); + String[] splitOne = onebc.split(","); + DmBclqjbp bclqjbp = new DmBclqjbp(); + bclqjbp.setZdr((String) req.getAttribute("yhms")); + bclqjbp.setZdrq(DateUtil.format(DateUtil.date(), "yyyy/MM/dd")); + bclqjbp.setDerq(DateUtil.format(DateUtil.date(), "yyyy/MM/dd")); + bclqjbp.setDelx("X"); + bclqjbp.setDcCh(splitOne[0]); + bclqjbp.setDcFd(splitOne[1]); + bclqjbp.setDcPl(splitOne[2]); + bclqjbp.setYbzs(new BigDecimal(splitOne[3])); + bclqjbp.setLqzl(new BigDecimal(splitOne[4])); + bclqjbp.setShzl(new BigDecimal(splitOne[5])); + bclqjbp.setYlzl(new BigDecimal(splitOne[6])); + bclqjbp.setQpyld(new BigDecimal(splitOne[7])); + bclqjbp.setLqbh(id); + String mc = splitOne[8].replace("組", "组"); + Dm_zhbmp zllb = dm_zhbmpRepository.findByBMLBAndBmsm("ZLLB", mc); + if (null == zllb) { + throw new CustomException(10104, "请查看板材领取表组立信息"); + } else { + bclqjbp.setDcZl(zllb.getBM()); + } + bclqjbp.setJsms(new BigDecimal(splitOne[9])); + bclqjbp.setShms(new BigDecimal(splitOne[10])); + int cs = 0; +// List bclqmxpListOld = bclqmxpService.list(new QueryWrapper().eq("DC_CH_z", bclqjbp.getDcCh()) +// .eq("DC_ZL_z", bclqjbp.getDcZl()).eq("DC_PL_z", bclqjbp.getDcPl()).eq("DELX_z", "X")); + List bclqmxpListOld = bclqmxpService.list(new QueryWrapper().eq("DC_CH_z", bclqjbp.getDcCh()) + .eq("DC_PL_z", bclqjbp.getDcPl()).eq("DELX_z", "X")); + if (bclqmxpListOld.size() > 0 && "01".equals(zt)) { + // 提示是否覆盖 + map.put("zt", "02"); + return map; + } else if ("02".equals(zt) && xcdel == 1) { +// bclqmxpService.remove(new QueryWrapper().eq("DC_CH_z", bclqjbp.getDcCh()) +// .eq("DC_ZL_z", bclqjbp.getDcZl()).eq("DC_PL_z", bclqjbp.getDcPl()).eq("DELX_z", "X") +// ); +// bclqjbpService.remove(new QueryWrapper().eq("DC_CH", bclqjbp.getDcCh()) +// .eq("dc_zl", bclqjbp.getDcZl()).eq("dc_pl", bclqjbp.getDcPl()).eq("delx", "X") +// ); + bclqmxpService.remove(new QueryWrapper().eq("DC_CH_z", bclqjbp.getDcCh()) + .eq("DC_PL_z", bclqjbp.getDcPl()).eq("DELX_z", "X") + ); + bclqjbpService.remove(new QueryWrapper().eq("DC_CH", bclqjbp.getDcCh()) + .eq("dc_pl", bclqjbp.getDcPl()).eq("delx", "X") + ); + if (bclqmxpListOld.size() <= 0) { + } else { + cs = bclqmxpListOld.get(0).getDrcs(); + } + map.put("zt", "01"); + } else { + map.put("zt", "01"); + } + //明细部分 + int hh = Integer.valueOf(lines.get(1)); + double xh = 1; + List addmx = new ArrayList<>(); + for (int i = 2; i < hh + 2; i++) { + String xcxx = lines.get(i); + String[] xcxxs = xcxx.split(","); + String input = xcxxs[0]; + int index = 0; + while (index < input.length() && !Character.isDigit(input.charAt(index))) { + index++; + } + String wpmc = input.substring(0, index); + // 寻找最后一个等号的位置 + int lastEqualsIndex = input.lastIndexOf('='); + // 获取最后一个等号后面的字符 + String wpgg = input.substring(lastEqualsIndex + 1); + // 获取最后一个中文后面等号前面的字符 + int lastChineseIndex = 0; + for (int ii = lastEqualsIndex - 1; ii >= 0; ii--) { + if (Character.isLetter(input.charAt(ii))) { + lastChineseIndex = ii + 1; + break; + } + } + String wpxh = input.substring(lastChineseIndex, lastEqualsIndex); + DmBclqmxp bclqmxp = new DmBclqmxp(); + //bclqmxp + bclqmxp.setXh(new BigDecimal(xh + "")); + bclqmxp.setWpmc(wpmc); + bclqmxp.setWpgg(wpgg); + bclqmxp.setWpxh(wpxh); + bclqmxp.setYlzd11(new BigDecimal(StringUtils.isBlank(xcxxs[1]) ? "0" : xcxxs[1])); + bclqmxp.setSl(new BigDecimal(StringUtils.isBlank(xcxxs[2]) ? "0" : xcxxs[2])); + bclqmxp.setLqzl(new BigDecimal(StringUtils.isBlank(xcxxs[3]) ? "0" : xcxxs[3])); + bclqmxp.setShzl(new BigDecimal(StringUtils.isBlank(xcxxs[4]) ? "0" : xcxxs[4])); + bclqmxp.setYlzl(new BigDecimal(StringUtils.isBlank(xcxxs[5]) ? "0" : xcxxs[5])); + bclqmxp.setQpyld(new BigDecimal(StringUtils.isBlank(xcxxs[6]) ? "0" : xcxxs[6])); + bclqmxp.setYlzd12(new BigDecimal(StringUtils.isBlank(xcxxs[7]) ? "0" : xcxxs[7])); + bclqmxp.setLqms(new BigDecimal(StringUtils.isBlank(xcxxs[8]) ? "0" : xcxxs[8])); + bclqmxp.setShms(new BigDecimal(StringUtils.isBlank(xcxxs[9]) ? "0" : xcxxs[9])); + bclqmxp.setDcPlZ(bclqjbp.getDcPl()); + bclqmxp.setDcZlZ(bclqjbp.getDcZl()); + bclqmxp.setDcChZ(bclqjbp.getDcCh()); + bclqmxp.setDcFdZ(bclqjbp.getDcFd()); + bclqmxp.setDelxZ(bclqjbp.getDelx()); + bclqmxp.setDerqZ(bclqjbp.getDerq()); + bclqmxp.setDrcs(cs + 1); + bclqmxp.setLqbh(bclqjbp.getLqbh()); + //////////// 主表部分 + bclqmxp.setZdrZ(bclqjbp.getZdr()); + bclqmxp.setZdrqZ(bclqjbp.getZdrq()); + bclqmxp.setDerqZ(bclqjbp.getDerq()); + bclqmxp.setDelxZ("X"); + bclqmxp.setDcChZ(bclqjbp.getDcCh()); + bclqmxp.setDcFdZ(bclqjbp.getDcFd()); + bclqmxp.setDcPlZ(bclqjbp.getDcPl()); + bclqmxp.setYbzsZ(bclqjbp.getYbzs()); + bclqmxp.setLqzlZ(bclqjbp.getLqzl()); + bclqmxp.setShzlZ(bclqjbp.getShzl()); + bclqmxp.setYlzlZ(bclqjbp.getYlzl()); + bclqmxp.setQpyldZ(bclqjbp.getQpyld()); + bclqmxp.setDcZlZ(bclqjbp.getDcZl()); + bclqmxp.setJsmsZ(bclqjbp.getJsms()); + bclqmxp.setShmsZ(bclqjbp.getShms()); + xh++; + List list = dmWpjbpServicel.list(new QueryWrapper().eq("WPGG", bclqmxp.getWpxh()).eq("WPXH", bclqmxp.getWpgg()).eq("WPMC", bclqmxp.getWpmc())); + if(list.size()<=0){ + List list1 = dmWpjbpServicel.list(new QueryWrapper().eq("WPGG", bclqmxp.getWpxh()).eq("WPXH", bclqmxp.getWpgg())); + if(list.size()<=0){ + + this.insertwpjbbByxcLq(bclqmxp.getWpmc(),bclqmxp.getWpgg(),bclqmxp.getWpxh(),bclqmxp.getDcChZ(),bclqmxp.getZdrZ()); + }else{ + bclqmxp.setWph(list1.get(0).getWph()); + } + }else { + bclqmxp.setWph(list.get(0).getWph()); + } + addmx.add(bclqmxp); + } + if (addmx.size() > 0) { + bclqmxpService.saveBatch(addmx); + } + bclqjbpService.save(bclqjbp); + return map; + // 判断 INSERT INTO DM_WPJBP(WPH,WPMC,WPFLM,WPXH,WPGG,DC_CH,ZDRY,XGSJ,WPJB,GZLX,JLDW,JLDW1 ) + // VALUES (:ls_wpbm,:as_wpmc,:as_wpfl,:as_wpxh,:as_wpgg,:as_dc_ch,:gs_user,:gs_xtrq,'Y','M',:ls_jldw,'19') ; + } + + //C16K-2_011批量手工板材统计数据_3跨.BC + public Map bctjUpload(List lines, String fileName, HttpServletRequest req, String zt, int bctjdel) throws CustomException { + Map map = new HashMap(); + List adds = new ArrayList<>(); + int indexOfUnderscore = fileName.indexOf('_'); + String czbh = fileName.substring(0, indexOfUnderscore); +// List zllbs = dm_zhbmpRepository.findByBMLB("ZLLB"); +// Map zllbMap = zllbs.stream().collect(Collectors.toMap(Dm_zhbmp::getBmsm, Dm_zhbmp::getBM)); + + List zllbs = dm_zhbmpRepository.findByBMLB("ZLLB"); + List kwxxs = dm_zhbmpRepository.findByBMLB("KWXX"); + List qgkws = dm_zhbmpRepository.findByBMLB("QGKW"); + Map zllbMap = zllbs.stream().collect(Collectors.toMap(Dm_zhbmp::getBmsm, Dm_zhbmp::getBM)); + Map kwxxMap = kwxxs.stream().collect(Collectors.toMap(Dm_zhbmp::getBM, Dm_zhbmp::getBmsm)); + Map qgKwMap = qgkws.stream().collect(Collectors.toMap(Dm_zhbmp::getBmsm, Dm_zhbmp::getBM)); + // 2. 第一个_后面批前面的字符 + int indexOfSecondUnderscore = fileName.lastIndexOf('_'); + String pl = fileName.substring(indexOfUnderscore + 1, fileName.lastIndexOf('批')); + String kw; + // 3. 最后一个_后面.前面的字符 + if (fileName.contains("跨")) { + int indexOfDot = fileName.lastIndexOf('跨'); + kw = fileName.substring(indexOfSecondUnderscore + 1, indexOfDot); + } else if (fileName.contains("光电")) { + kw = "光电"; + } else { + throw new CustomException(10106, fileName + "跨位信息不存在"); + } + DmCbxxp cbbm = dmCbxxpService.getOne(new QueryWrapper().select("isnull(xbz,'N') AS xbz").eq("cbbm", czbh)); + String ls_jgdm = ""; + if (cbbm.getXbz().equals("Y")) { + if (fileName.contains("数控")) { + ls_jgdm = "1020"; + } + if (fileName.contains("手工")) { + ls_jgdm = "1030"; + } + } + int cs = 0; + //select count(*) into:li_zl from dm_bchxylp where dc_ch =:dc_ch and dc_pl =:dc_pl and zzcj =:ls_zzcj and hxfl ='B' and tzbh = :ls_import[1]; + List tjListOld = bchxylpService.list(new QueryWrapper().eq("dc_ch", czbh).eq("dc_pl", pl).eq("hxfl", "B")); + if (tjListOld.size() > 0 && "01".equals(zt)) { + // 提示是否覆盖 + map.put("zt", "02"); + return map; + } else if ("02".equals(zt) && bctjdel == 1) { + bchxylpService.remove(new QueryWrapper().eq("dc_ch", czbh).eq("dc_pl", pl).eq("hxfl", "B")); + if (tjListOld.size() <= 0) { + } else { + cs = tjListOld.get(0).getDrcs(); + } + map.put("zt", "01"); + } else { + map.put("zt", "01"); + } + for (String line : lines) { + String[] splitLine = line.split(","); + // 得到 余料数量 + int ylsl = Integer.valueOf(splitLine[5]); + if (0 == ylsl) { + DmBchxylp bchxylp = new DmBchxylp(); + String id = syService.f_getpjh("DM", "SYSTEM", "YLBH"); + bchxylp.setDcCh(czbh); + bchxylp.setDcPl(pl); + bchxylp.setHxbh(id); + bchxylp.setXh(1d); + bchxylp.setTzbh(splitLine[0]); + bchxylp.setSfyl(splitLine[1]); + bchxylp.setDcZl(zllbMap.get(splitLine[2])); + String[] ggAndsl = splitLine[3].split("="); + bchxylp.setWpgg(ggAndsl[0]); + bchxylp.setSl(new BigDecimal(ggAndsl[1])); + bchxylp.setWpxh(splitLine[4]); + bchxylp.setHxfl("B"); + bchxylp.setZdr((String) req.getAttribute("yhms")); + bchxylp.setZdrq(DateUtil.format(DateUtil.date(), "yyyy/MM/dd")); + if (cbbm.getXbz().equals("N")) { + if ("N".equals(splitLine[0].substring(0, 1))) { + ls_jgdm = "1030"; + } else { + ls_jgdm = "1020"; + } + } + bchxylp.setYlzd1(ls_jgdm); + bchxylp.setZzcj(kw); + bchxylp.setDrcs(cs + 1); + String tzbh=splitLine[0]; + String hxlx=""; + if(tzbh.substring(4,5).equals("S")){ + hxlx = "1030"; + }else if (tzbh.substring(4,5).equals("N")){ + hxlx = "1020"; + } + // 跨位 + String s = kwxxMap.get(tzbh.substring(4,7)); + if(StringUtils.isBlank(s)){ + throw new CustomException(10106, fileName + "跨位信息不存在"); + } + String zl = this.getZL(tzbh); + if(StringUtils.isBlank(zl)){ + throw new CustomException(10106, fileName + "组立信息不存在"); + } + String zlbm = zllbMap.get(zl); + String zzcj = qgKwMap.get(s); + bchxylp.setYlzd1(hxlx); + bchxylp.setZzcj(zzcj); + bchxylp.setDcZl(zlbm); + adds.add(bchxylp); + } else { + String ylggs = ""; + for (int iiy = 1; iiy <= ylsl; iiy++) { + if (iiy == ylsl) { + ylggs = ylggs + splitLine[0].substring(1) + "S_" + iiy + "(" + splitLine[5 + iiy] + ")"; + } else { + ylggs = ylggs + splitLine[0].substring(1) + "S_" + iiy + "(" + splitLine[5 + iiy] + "),"; + } + } + for (int i = 1; i <= ylsl; i++) { + DmBchxylp bchxylp = new DmBchxylp(); + String id = syService.f_getpjh("DM", "SYSTEM", "YLBH"); + bchxylp.setDcCh(czbh); + bchxylp.setDcPl(pl); + bchxylp.setHxbh(id); + bchxylp.setXh(Double.valueOf(i)); + bchxylp.setTzbh(splitLine[0]); + bchxylp.setSfyl(splitLine[1]); + bchxylp.setDcZl(zllbMap.get(splitLine[2])); + String[] ggAndsl = splitLine[3].split("="); + bchxylp.setWpgg(ggAndsl[0]); + bchxylp.setSl(new BigDecimal(ggAndsl[1])); + bchxylp.setWpxh(splitLine[4]); + bchxylp.setHxfl("B"); + bchxylp.setZdr((String) req.getAttribute("yhms")); + bchxylp.setZdrq(DateUtil.format(DateUtil.date(), "yyyy/MM/dd")); + if (cbbm.getXbz().equals("N")) { + if ("N".equals(splitLine[0].substring(0, 1))) { + ls_jgdm = "1030"; + } else { + ls_jgdm = "1020"; + } + } + bchxylp.setYlzd1(ls_jgdm); + bchxylp.setZzcj(kw); + bchxylp.setDrcs(cs + 1); + bchxylp.setYlbh(splitLine[0].substring(1) + "S_" + i); + bchxylp.setYlgg(splitLine[5 + i]); + bchxylp.setYlggs(ylggs); + String tzbh=splitLine[0]; + String hxlx=""; + if(tzbh.substring(4,5).equals("S")){ + hxlx = "1030"; + }else if (tzbh.substring(4,5).equals("N")){ + hxlx = "1020"; + } + // 跨位 + String s = kwxxMap.get(tzbh.substring(4,7)); + if(StringUtils.isBlank(s)){ + throw new CustomException(10106, fileName + "跨位信息不存在"); + } + String zl = this.getZL(tzbh); + if(StringUtils.isBlank(zl)){ + throw new CustomException(10106, fileName + "组立信息不存在"); + } + String zlbm = zllbMap.get(zl); + String zzcj = qgKwMap.get(s); + bchxylp.setYlzd1(hxlx); + bchxylp.setZzcj(zzcj); + bchxylp.setDcZl(zlbm); + adds.add(bchxylp); + } + } + } + if (adds.size() > 0) { + bchxylpService.saveBatch(adds); + } + return map; + } + + public Map xctjUpload(List lines, String fileName, HttpServletRequest req, String zt, int xctjdel) throws CustomException { + Map map = new HashMap(); + List zllbs = dm_zhbmpRepository.findByBMLB("ZLLB"); + List kwxxs = dm_zhbmpRepository.findByBMLB("KWXX"); + List qgkws = dm_zhbmpRepository.findByBMLB("QGKW"); + Map zllbMap = zllbs.stream().collect(Collectors.toMap(Dm_zhbmp::getBmsm, Dm_zhbmp::getBM)); + Map kwxxMap = kwxxs.stream().collect(Collectors.toMap(Dm_zhbmp::getBM, Dm_zhbmp::getBmsm)); + Map qgKwMap = qgkws.stream().collect(Collectors.toMap(Dm_zhbmp::getBmsm, Dm_zhbmp::getBM)); + List adds = new ArrayList<>(); +// List zllbs = dm_zhbmpRepository.findByBMLB("ZLLB"); +// Map zllbMap = zllbs.stream().collect(Collectors.toMap(Dm_zhbmp::getBmsm, Dm_zhbmp::getBM)); + int indexOfUnderscore = fileName.indexOf('_'); + String czbh = fileName.substring(0, indexOfUnderscore); + // 2. 第一个_后面批前面的字符 + int indexOfSecondUnderscore = fileName.lastIndexOf('_'); + String pl = fileName.substring(indexOfUnderscore + 1, fileName.lastIndexOf('批')); + String kw; + // 3. 最后一个_后面.前面的字符 + if (fileName.contains("跨")) { + int indexOfDot = fileName.lastIndexOf('跨'); + kw = fileName.substring(indexOfSecondUnderscore + 1, indexOfDot); + } else if (fileName.contains("光电")) { + kw = "光电"; + } else { + throw new CustomException(10106, fileName + "跨位信息不存在"); + } + int cs = 0; + //select count(*) into:li_zl from dm_bchxylp where dc_ch =:dc_ch and dc_pl =:dc_pl and zzcj =:ls_zzcj and hxfl ='B' and tzbh = :ls_import[1]; + List tjListOld = bchxylpService.list(new QueryWrapper().eq("dc_ch", czbh).eq("dc_pl", pl).eq("hxfl", "X")); + if (tjListOld.size() > 0 && "01".equals(zt)) { + // 提示是否覆盖 + map.put("zt", "02"); + return map; + } else if ("02".equals(zt) && xctjdel == 1) { + bchxylpService.remove(new QueryWrapper().eq("dc_ch", czbh).eq("dc_pl", pl).eq("hxfl", "X")); + if (tjListOld.size() <= 0) { + } else { + cs = tjListOld.get(0).getDrcs(); + } + map.put("zt", "01"); + dezt = "01"; + } else { + map.put("zt", "01"); + } + int ii = 1; + for (String line : lines) { + String[] splitLine = line.split(","); + String id = syService.f_getpjh("DM", "SYSTEM", "YLBH"); + String[] wps = splitLine[3].split("="); + String cz = wps[1]; + String cd = wps[0].split("-")[1]; + String input = wps[0].split("-")[0]; + int index = 0; + while (index < input.length() && !Character.isDigit(input.charAt(index))) { + index++; + } + String wpmc = input.substring(0, index); + // 寻找最后一个等号的位置 + // 获取最后一个等号后面的字符 + String wpgg = input.substring(wpmc.length()); + DmBchxylp bchxylp = new DmBchxylp(); + bchxylp.setDcCh(czbh); + bchxylp.setDcPl(pl); + bchxylp.setHxbh(id); + bchxylp.setXh(Double.valueOf(ii)); + bchxylp.setTzbh(splitLine[0]); + bchxylp.setSfyl(splitLine[1]); + bchxylp.setDcZl(zllbMap.get(splitLine[2])); + bchxylp.setWpgg(wpgg); + bchxylp.setWpxh(cz); + bchxylp.setXcmc(wpmc); + bchxylp.setXccd(new BigDecimal(cd)); + bchxylp.setSl(new BigDecimal(splitLine[4])); + if (splitLine.length > 5) { + bchxylp.setYlcd(new BigDecimal(StringUtils.isBlank(splitLine[5]) ? "0" : splitLine[5])); + } + bchxylp.setHxfl("X"); + bchxylp.setZdr((String) req.getAttribute("yhms")); + bchxylp.setZdrq(DateUtil.format(DateUtil.date(), "yyyy/MM/dd")); + bchxylp.setDrcs(cs + 1); + ii++; + + + String tzbh=splitLine[0]; + String hxlx=""; + if(tzbh.substring(4,5).equals("S")){ + hxlx = "1030"; + }else if (tzbh.substring(4,5).equals("N")){ + hxlx = "1020"; + } + // 跨位 + String s = kwxxMap.get(tzbh.substring(4,7)); + if(StringUtils.isBlank(s)){ + throw new CustomException(10106, fileName + "跨位信息不存在"); + } + String zl = this.getZL(tzbh); + if(StringUtils.isBlank(zl)){ + throw new CustomException(10106, fileName + "组立信息不存在"); + } + String zlbm = zllbMap.get(zl); + String zzcj = qgKwMap.get(s); + + bchxylp.setZzcj(zzcj); + bchxylp.setDcZl(zlbm); + adds.add(bchxylp); + } + if (adds.size() > 0) { + bchxylpService.saveBatch(adds); + } + return map; + } + + public Map bctltUpload(List lines, String fileName, HttpServletRequest req, String zt, int tld) throws CustomException, ScriptException { + Map map = new HashMap(); + List adds = new ArrayList<>(); + List addmxs = new ArrayList<>(); + int indexOfUnderscore = fileName.indexOf('_'); + String czbh = fileName.substring(0, indexOfUnderscore); + // 2. 第一个_后面批前面的字符 + int indexOfSecondUnderscore = fileName.lastIndexOf('_'); + String pl = fileName.substring(indexOfUnderscore + 1, fileName.lastIndexOf('套')); + List tltListOld = bchxmxpService.list(new QueryWrapper().eq("DC_CH_z", czbh).eq("dc_pl_z", pl)); + List zllbs = dm_zhbmpRepository.findByBMLB("ZLLB"); + List kwxxs = dm_zhbmpRepository.findByBMLB("KWXX"); + List qgkws = dm_zhbmpRepository.findByBMLB("QGKW"); + Map zllbMap = zllbs.stream().collect(Collectors.toMap(Dm_zhbmp::getBmsm, Dm_zhbmp::getBM)); + Map kwxxMap = kwxxs.stream().collect(Collectors.toMap(Dm_zhbmp::getBM, Dm_zhbmp::getBmsm)); + Map qgKwMap = qgkws.stream().collect(Collectors.toMap(Dm_zhbmp::getBmsm, Dm_zhbmp::getBM)); + int cs = 0; + if (tltListOld.size() > 0 && "01".equals(zt)) { + // 提示是否覆盖 + map.put("zt", "02"); + return map; + } else if ("02".equals(zt) && tld == 1) { + bchxmxpService.remove(new QueryWrapper().eq("DC_CH_z", czbh).eq("dc_pl_z", pl)); + bchxjbpService.remove(new QueryWrapper().eq("dc_ch", czbh).eq("dc_pl", pl)); + if (tltListOld.size() <= 0) { + } else { + cs = tltListOld.get(0).getDrcs(); + } + map.put("zt", "01"); + } else { + map.put("zt", "01"); + } + for (int j = 0; j <= lines.size(); ) { + if (StringUtils.isBlank(lines.get(j))) { + break; + } + String[] tltLine = lines.get(j).split(","); + // todo 没有判断 调料图是否重复 + int ll_ii = 0; + int ggsl = Integer.valueOf(tltLine[1].split("=")[1]); + String tzbh = tltLine[0]; + String hxlx = ""; + if (tzbh.substring(0, 1).equals("S")) { + hxlx = "1030"; + } else if (tzbh.substring(0, 1).equals("N")) { + hxlx = "1020"; + } + // 根据图纸编号获取 手工，数控 跨位，组立，、 + if(tzbh.substring(4,5).equals("S")){ + hxlx = "1030"; + }else if(tzbh.substring(4,5).equals("N")){ + hxlx = "1020"; + } + // 跨位 + String s = kwxxMap.get(tzbh.substring(4,7)); + if(StringUtils.isBlank(s)){ + throw new CustomException(10106, fileName + "跨位信息不存在"); + } + String zl = this.getZL(tzbh); + if(StringUtils.isBlank(zl)){ + throw new CustomException(10106, fileName + "组立信息不存在"); + } + String zlbm = zllbMap.get(zl); + String zzcj = qgKwMap.get(s); + for (int i = 1; i <= ggsl; i++) { + DmBchxjbp bchxjbp = new DmBchxjbp(); + String id = syService.f_getpjh("DM", "SYSTEM", "BCHX"); + bchxjbp.setHxbh(id); + bchxjbp.setDcCh(czbh); + bchxjbp.setDcPl(pl); + bchxjbp.setDcZl(zlbm); + bchxjbp.setYlzd1(hxlx); + if (i == 1 || ggsl == 1) { + bchxjbp.setTzbh(tzbh); + } else if (i > 1) { + ll_ii++; + bchxjbp.setTzbh(tzbh + ll_ii); + } + if (tzbh.substring(4,5).equals("X")) { + //todo +// li_nu = 0 +// li_number = 0 +// do while li_nu = 0 +// li_number++ +// ls_number = mid(ls_gg,li_number,1) +// if isnumber(ls_number) = true then +// //得到名称 +// ls_clmc = mid(ls_gg,1,li_number - 1) +// //得到规格 +// ls_gg = mid(ls_gg,li_number) +// li_nu = 1 +// end if +// loop +// win_k.dw_master.setitem(li_get,'clmc',ls_clmc) +// +// win_k.dw_master.setitem(li_get,'ljsl',dec(ls_import[4])) + bchxjbp.setHxfl("X"); + bchxjbp.setLjsl(new BigDecimal(tltLine[3])); + } else { + if (tltLine.length >= 6) { + bchxjbp.setYlzd4(new BigDecimal(tltLine[3])); + bchxjbp.setHxcd(new BigDecimal(tltLine[4])); + bchxjbp.setLjsl(new BigDecimal(tltLine[5])); + bchxjbp.setHxfl("B"); + } + } + String gg = ""; + if (tltLine[1].contains("=")) { + String[] ggtemp = tltLine[1].split("="); + if (ggtemp[0].contains("-")) { + String[] ggtemp1 = ggtemp[0].split("-"); + gg = ggtemp1[0]; + gg = gg.replaceAll("[\\u4e00-\\u9fa5]", ""); + } else { + gg = ggtemp[0]; + } + } + if (gg.matches("[0-9.*]*")) { + bchxjbp.setWpgg(gg.replaceAll("\\.0", "")); + } + ; + bchxjbp.setWpxh(tltLine[2]); + bchxjbp.setZdr((String) req.getAttribute("yhms")); + bchxjbp.setZdrq(DateUtil.format(DateUtil.date(), "yyyy/MM/dd")); + bchxjbp.setXtrq(DateUtil.format(DateUtil.date(), "yyyy/MM/dd")); + bchxjbp.setYlzd2("1"); + adds.add(bchxjbp); + // 获取零件数量 + int ljsl; // 第0行 + if (tltLine.length >= 6) { + ljsl = Integer.valueOf(tltLine[5]); + } else { + ljsl = Integer.valueOf(tltLine[3]); + } + List ljmcs = new ArrayList(); + for (int lji = 1; lji <= ljsl; lji++) { + DmBchxmxp bchxmxp = new DmBchxmxp(); + bchxmxp.setHxbh(id); + bchxmxp.setXh(Double.valueOf(lji)); + // String hh = lines.get(j + lji); // 零件的坐标 + String ljmc = lines.get(j + lji); + BigDecimal sl = new BigDecimal("1"); + if (lines.get(j + lji).contains(",")) { + ljmc = lines.get(j + lji).split(",")[0]; + sl = new BigDecimal(lines.get(j + lji).split(",")[1]); + } + if (ljmcs.contains(ljmc)) { + } else { + ljmcs.add(ljmc); + bchxmxp.setWph(ljmc); + bchxmxp.setSl(sl); + //---------------------- + bchxmxp.setDcChZ(bchxjbp.getDcCh()); + bchxmxp.setDcPlZ(bchxjbp.getDcPl()); + bchxmxp.setYlzd1Z(bchxjbp.getYlzd1()); + bchxmxp.setTzbhZ(bchxjbp.getTzbh()); + bchxmxp.setYlzd4Z(bchxjbp.getYlzd4()); + bchxmxp.setHxcdZ(bchxjbp.getHxcd()); + bchxmxp.setLjslZ(bchxjbp.getLjsl()); + bchxmxp.setHxflZ(bchxjbp.getHxfl()); + bchxmxp.setWpggZ(bchxjbp.getWpgg()); + bchxmxp.setWpxhZ(bchxjbp.getWpxh()); + bchxmxp.setZdrZ(bchxjbp.getZdr()); + bchxmxp.setZdrqZ(bchxjbp.getZdrq()); + bchxmxp.setYlzd2Z(bchxjbp.getYlzd2()); + bchxmxp.setZzcj(zzcj); + bchxmxp.setDcZlZ(zl); + bchxmxp.setDrcs(cs + 1); + addmxs.add(bchxmxp); + } + } + j = j + ljsl + 1; + } + } + if (addmxs.size() > 0) { + bchxmxpService.saveBatch(addmxs); + bchxjbpService.saveBatch(adds); + dmBchxmxpMapper.updateWpgg(czbh, pl); + dmBchxmxpMapper.updateWph(czbh, pl); + } + // 反写批量表 零件编号 前4位是分段号 + addmxs.forEach(e -> { + UpdateWrapper qw = new UpdateWrapper<>(); + qw.set("jsq_tlt", DateUtil.format(DateUtil.date(), "yyyy/MM/dd")); + qw.eq("dc_ch", e.getDcChZ()); + qw.eq("dc_pl", e.getDcPlZ()); + qw.eq("dc_fd", StringUtils.isBlank(e.getWph()) ? "" : e.getWph().substring(0, 4)); + dmCzplpNewService.update(qw); + UpdateWrapper qw1 = new UpdateWrapper<>(); + qw1.set("jsq_tlt", DateUtil.format(DateUtil.date(), "yyyy/MM/dd")); + qw1.eq("dc_ch", e.getDcChZ()); + qw1.eq("dc_pl", e.getDcPlZ()); + qw1.eq("dc_fd", StringUtils.isBlank(e.getWph()) ? "" : e.getWph().substring(0, 4)); + dmTzjhService.update(qw1); + }); + return map; + } + + public Map ljptbUpload(List lines, String fileName, HttpServletRequest req, String zt, int ldpt) throws CustomException { + List adds = new ArrayList<>(); + Map map = new HashMap(); + + String czbh = ""; + String pl = ""; + String fd = ""; + int firstDashIndex = fileName.indexOf("-"); + if (firstDashIndex != -1) { + // 找到第二个短划线的位置，从第一个短划线的下一个位置开始搜索 + int secondDashIndex = fileName.indexOf("-", firstDashIndex + 1); + if (secondDashIndex != -1) { + // 使用 substring 方法拆分字符串 + czbh = fileName.substring(0, secondDashIndex); + pl = fileName.substring(secondDashIndex + 1).split("-")[0]; + fd = fileName.substring(0, fileName.indexOf(".", firstDashIndex + 1)).substring(secondDashIndex + 1).split("-")[1]; + System.out.println("第一部分：" + czbh); + System.out.println("第二部分：" + pl); + } + } else { + throw new CustomException(10104, "文件名格式错误！"); + } + List wlqdListOld = wlqdService.list(new QueryWrapper().eq("dc_ch", czbh).eq("dc_pl", pl)); + int cs = 0; + if (wlqdListOld.size() > 0 && "01".equals(zt) && 1 == ldpt) { + // 提示是否覆盖 + map.put("zt", "02"); + return map; + } else if ("02".equals(zt) && 1 == ldpt) { + wlqdService.remove(new QueryWrapper().eq("dc_ch", czbh).eq("dc_pl", pl)); + if (wlqdListOld.size() <= 0) { + } else { + cs = wlqdListOld.get(0).getDrcs(); + } + map.put("zt", "01"); + } else { + map.put("zt", "01"); + } + List sjlxs = dm_zhbmpRepository.findByBMLB("SJLX"); + List zllbs = dm_zhbmpRepository.findByBMLB("ZLLB"); + Map sjlxMap = sjlxs.stream().collect(Collectors.toMap(Dm_zhbmp::getBmsm, Dm_zhbmp::getBM)); + wlqdService.remove(new QueryWrapper().eq("dc_ch", czbh).eq("dc_fd", fd)); + Map zllbMap = zllbs.stream().collect(Collectors.toMap(Dm_zhbmp::getBmsm, Dm_zhbmp::getBM)); + int xh = 1; + for (String ljline : lines) { + String[] ljlines = ljline.split(","); + String pt = ljlines[9].replaceAll("[()]", ""); + String jldw = ""; + String wpfl = ""; + if ("型材".equals(pt)) { + jldw = "60"; + wpfl = "X"; + } else { + jldw = "51"; + wpfl = "B"; + } + DmWlqd wlqd = new DmWlqd(); + wlqd.setXwh(Double.valueOf(xh)); + wlqd.setFxwph(czbh + "=" + fd); + wlqd.setYlzd1(sjlxMap.get(pt)); + wlqd.setZxwph(ljlines[0].trim()); + wlqd.setWph(ljlines[0].trim()); + wlqd.setWpmc(ljlines[1].trim()); + wlqd.setWpgg(ljlines[2].trim()); + wlqd.setWpxh(ljlines[4].trim()); + wlqd.setJldw(jldw); + wlqd.setSl(new BigDecimal(StringUtils.isBlank(ljlines[3]) ? "0" : ljlines[3])); + wlqd.setWpflm(wpfl); + wlqd.setDezl(new BigDecimal(StringUtils.isBlank(ljlines[10]) ? "0" : ljlines[10])); + wlqd.setWpjb("L"); + wlqd.setGylb("0"); + wlqd.setGysbh(ljlines[0].trim()); + wlqd.setDcCh(czbh); + wlqd.setDcCm(czbh); + wlqd.setDcFd(fd); + wlqd.setDcPl(pl); + wlqd.setDcTz(ljlines[5].trim()); + wlqd.setDcYj(ljlines[6].trim()); + wlqd.setDcYs(ljlines[7].trim()); + wlqd.setZdry((String) req.getAttribute("yhms")); + wlqd.setXgrq(DateUtil.format(DateUtil.date(), "yyyy/MM/dd")); + wlqd.setDrcs(cs + 1); + wlqd.setZt("0"); + String mc = ljlines[8].replace("組", "组"); + //Dm_zhbmp zllb = dm_zhbmpRepository.findByBMLBAndBmsm("ZLLB", mc.trim()); + String zllb = zllbMap.get(mc.trim());// + if (StringUtils.isBlank(zllb)) { + throw new CustomException(10104, "请查看零件配套表组立信息"); + } else { + wlqd.setDcZl(zllb); + } + xh++; + adds.add(wlqd); + } + if (adds.size() > 0) { + wlqdService.saveBatch(adds); + insertWpjbbByLjptb(adds); + } + adds.forEach(e -> { + UpdateWrapper qw = new UpdateWrapper<>(); + qw.set("jsq_ptb", DateUtil.format(DateUtil.date(), "yyyy/MM/dd")); + qw.eq("dc_ch", e.getDcCh()); + qw.eq("dc_pl", e.getDcPl()); + qw.eq("dc_fd", e.getDcFd()); + dmCzplpNewService.update(qw); + UpdateWrapper qw1 = new UpdateWrapper<>(); + qw1.set("jsq_lqb", DateUtil.format(DateUtil.date(), "yyyy/MM/dd")); + qw1.eq("dc_ch", e.getDcCh()); + qw1.eq("dc_pl", e.getDcPl()); + qw1.eq("dc_fd", e.getDcFd()); + dmTzjhService.update(qw1); + }); + // 根据文件名字得到第二个- 进行拆分 + return map; + } + + public void insertWpjbbByLjptb(List list) { + int wph = dmWpjbpServicel.count(new QueryWrapper().eq("wph", list.get(0).getDcCh() + list.get(0).getDcFd())); + if (wph == 0) { + DmWpjbp dm = new DmWpjbp(); + dm.setWph(list.get(0).getDcCh() + list.get(0).getDcFd()); + dm.setWpmc("配套表"); + dm.setWpjb("H"); + dm.setDcCh(list.get(0).getDcCh()); + dm.setDcFd(list.get(0).getDcFd()); + dmWpjbpServicel.save(dm); + } + List adds = new ArrayList<>(); + for (DmWlqd wlqd : list) { + int zxwph = dmWpjbpServicel.count(new QueryWrapper().eq("wph", wlqd.getZxwph())); + if (zxwph == 0) { +// INSERT INTO DM_WPJBP(WPH,WPMC,WPXH,WPGG,WPJB,GYLB,GYSBH,YHFLH,ABCLX,JLDW, +// ZDRY,XGSJ,DC_CH,DC_CM,DC_PL,DC_FD,DC_LPH,JLDW1,WPFLM,DC_TH,DC_ZL,GZLX ) +// VALUES (:ls_wph,:ls_wpmc,:ls_wpxh,:ls_wpgg,:ls_wpjb,:ls_gylb,:ls_gysbh,:ls_hsfl, +// :ls_abc,:ls_jldw,:gs_user,:gs_xtrq,:ls_dc_ch,:ls_dc_cm,:ls_dc_pl,:ls_dc_fd,:ls_dc_lph,'19',:ls_wpflm,:ls_dc_th,:ls_dc_zl,'M') + DmWpjbp dmWpjbp = new DmWpjbp(); + dmWpjbp.setWph(wlqd.getZxwph()); + dmWpjbp.setWpmc(wlqd.getWpmc()); + dmWpjbp.setWpxh(""); + dmWpjbp.setWpgg(""); + dmWpjbp.setWpjb(wlqd.getWpjb()); + dmWpjbp.setGylb(wlqd.getGylb()); + dmWpjbp.setYhflh(wlqd.getGysbh()); + dmWpjbp.setAbclx(wlqd.getAbclx()); + dmWpjbp.setJldw(wlqd.getJldw()); + dmWpjbp.setZdry(wlqd.getZdry()); + dmWpjbp.setXgsj(wlqd.getXgrq()); + dmWpjbp.setDcCh(wlqd.getDcCh()); + dmWpjbp.setDcCm(wlqd.getDcCh()); + dmWpjbp.setDcPl(wlqd.getDcPl()); + dmWpjbp.setDcFd(wlqd.getDcFd()); + dmWpjbp.setDcLph(""); + dmWpjbp.setJldw1("19"); + dmWpjbp.setWpflm(wlqd.getWpflm()); + dmWpjbp.setDcTh(wlqd.getDcTh()); + dmWpjbp.setDcZl(wlqd.getDcZl()); + dmWpjbp.setGzlx("M"); + adds.add(dmWpjbp); + } + } + if (adds.size() > 0) { + dmWpjbpServicel.saveBatch(adds); + } + } + + public void insertwpjbbByxcLq(String wpmc,String wpxh,String wpgg,String ch,String username){ + String wpid= syService.f_getpjh("SS","SYSTEM","WPH"); + DmWpjbp wpjbp= new DmWpjbp(); + wpjbp.setWph(wpid); + wpjbp.setWpmc(wpmc); + wpjbp.setWpflm("X"); + wpjbp.setWpxh(wpxh); + wpjbp.setWpgg(wpgg); + wpjbp.setDcCh(ch); + wpjbp.setZdry(username); + wpjbp.setXgsj(DateUtil.format(DateUtil.date(), "yyyy/MM/dd")); + wpjbp.setWpjb("Y"); + wpjbp.setGzlx("M"); + wpjbp.setJldw("60"); + wpjbp.setJldw1("19"); + dmWpjbpServicel.save(wpjbp); + } + + public int ssum(String input, char targetChar) { + int count = 0; + for (int i = 0; i < input.length(); i++) { + if (input.charAt(i) == targetChar) { + count++; + } + } + return count; + } + + public List insertBom( HttpServletRequest request,String dcch,String dcpl) throws CustomException { + +// dmBomService.remove(new QueryWrapper().eq("sjch",dcch).eq("pl",dcpl)); + Map querMap= new HashMap(); + querMap.put("dcch",dcch); + querMap.put("dcpl",dcpl); + querMap.put("delx","B"); + querMap.put("hxfl","B"); + List bcLQlList = bclqmxpService.getBcLQlList(querMap); + List tltList = bchxmxpService.getTLTList(querMap); + List bcTJlList = bchxylpService.getBcTJlList(querMap); + List adds =new ArrayList<>(); + /* bcLQlList.forEach(e->{ + DmBom dmBom=new DmBom(); + dmBom.setType("1"); + dmBom.setSjch(e.getDcChZ()); + dmBom.setPl(e.getDcPlZ()); + dmBom.setFds(e.getDcFdZ()); + dmBom.setZl(e.getDcZlZ()); + dmBom.setWpcz(e.getWpxh()); + dmBom.setWpgg(e.getWpgg()); + dmBom.setBh( new BigDecimal(e.getWpgg().split("\\*")[0])); + dmBom.setBc(new BigDecimal(e.getWpgg().split("\\*")[2])); + //bcTJlList.stream().filter(fst->).collect(Collectors.toList()); + });*/ + tltList.forEach(e->{ + if(StringUtils.isNotBlank(e.getWpggZ())){ + + + DmBom dmBom=new DmBom(); + dmBom.setQgcd(e.getYlzd4Z()); + dmBom.setHxcd(e.getHxcdZ()); + dmBom.setTzbh(e.getTzbhZ()); + dmBom.setTlsl(e.getSl()); + dmBom.setLjbh(e.getWph()); + dmBom.setLjsl(e.getLjslZ()); + dmBom.setSjch(e.getDcChZ()); + dmBom.setPl(e.getDcPlZ()); + dmBom.setFd(e.getWph().substring(0,4)); + + dmBom.setWpcz(e.getWpxhZ()); + dmBom.setWpgg(e.getWpggZ()); + System.out.println("e.getWpggZ().split(\"\\\\*\")[0] = " + e.getWpggZ().split("\\*")[0]); + System.out.println("e.getWpggZ().split(\"\\\\*\")[0] = " + e.getWpggZ()); + dmBom.setBh( new BigDecimal(e.getWpggZ().split("\\*")[0])); + dmBom.setBc(new BigDecimal(e.getWpggZ().split("\\*")[2])); + String tzbh=e.getTzbhZ(); + String hxlx=""; + // 根据图纸编号获取 手工，数控 跨位，组立，、 + if(tzbh.substring(4,5).equals("S")){ + hxlx = "1030"; + }else if(tzbh.substring(4,5).equals("N")){ + hxlx = "1020"; + } + List zllbs = dm_zhbmpRepository.findByBMLB("ZLLB"); + List kwxxs = dm_zhbmpRepository.findByBMLB("KWXX"); + List qgkws = dm_zhbmpRepository.findByBMLB("QGKW"); + Map zllbMap = zllbs.stream().collect(Collectors.toMap(Dm_zhbmp::getBmsm, Dm_zhbmp::getBM)); + Map kwxxMap = kwxxs.stream().collect(Collectors.toMap(Dm_zhbmp::getBM, Dm_zhbmp::getBmsm)); + Map qgKwMap = qgkws.stream().collect(Collectors.toMap(Dm_zhbmp::getBmsm, Dm_zhbmp::getBM)); + // 跨位 + String s = kwxxMap.get(tzbh.substring(4,7)); + + String zl = this.getZL(tzbh); + + String zlbm = zllbMap.get(zl); + String zzcj = qgKwMap.get(s); + dmBom.setZl(zlbm); + dmBom.setKw(zzcj); + dmBom.setLqlb(hxlx); + List collect = bcTJlList.stream().filter(fst -> fst.getTzbh().equals(e.getTzbhZ())).collect(Collectors.toList()); + if(collect.size()>0){ + dmBom.setTjbs("Y"); + } + List collect1 = bcLQlList.stream().filter(fst -> fst.getWpgg().equals(e.getWpggZ()) && fst.getWpxh().equals(e.getWpxhZ()) + + ).collect(Collectors.toList()); + + if(collect1.size()>0){ + dmBom.setLqbs("Y"); + } + adds.add(dmBom); + } + }); +// dmBomService.insertBoms(adds); + return adds; + } + + // 根据套料图号得到组立信息。 + public String getZL(String tzbh){ + String bh=tzbh.substring(6,8); + if (tzbh.substring(4,5).equals("X")) { + if("XX".equalsIgnoreCase(bh)){ + return "小组立"; + }else if ("XD".equalsIgnoreCase(bh)){ + return "中大组立"; + } + }else{ + if("XX".equalsIgnoreCase(bh)){ + return "焊接机器人肘板"; + }else if ("GX".equalsIgnoreCase(bh)){ + return "光电"; + } + + } + String bh1=tzbh.substring(7,8); + if("X".equalsIgnoreCase(bh1)){ + return"小组立"; + } + if("D".equalsIgnoreCase(bh1)){ + return"中大组立"; + } + + + return ""; + } +} diff --git a/src/main/java/com/dsic/gj_erp/service/jcsj/impl/DmBchxjbpServiceImpl.java b/src/main/java/com/dsic/gj_erp/service/jcsj/impl/DmBchxjbpServiceImpl.java new file mode 100644 index 0000000..3af586b --- /dev/null +++ b/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; + +/** + *

+ * 服务实现类 + *

+ * + * @author xn + * @since 2023-09-20 + */ +@Service +public class DmBchxjbpServiceImpl extends ServiceImpl implements DmBchxjbpService { + +} diff --git a/src/main/java/com/dsic/gj_erp/service/jcsj/impl/DmBchxmxpServiceImpl.java b/src/main/java/com/dsic/gj_erp/service/jcsj/impl/DmBchxmxpServiceImpl.java new file mode 100644 index 0000000..6b850a8 --- /dev/null +++ b/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; + +/** + *

+ * 服务实现类 + *

+ * + * @author xn + * @since 2023-09-20 + */ +@Service +public class DmBchxmxpServiceImpl extends ServiceImpl implements DmBchxmxpService { + @Autowired + DmBchxmxpMapper dmBchxmxpMapper; + @Override + public List getTLTList(Map map) { + return dmBchxmxpMapper.getTLTList(map); + } +} diff --git a/src/main/java/com/dsic/gj_erp/service/jcsj/impl/DmBchxylpServiceImpl.java b/src/main/java/com/dsic/gj_erp/service/jcsj/impl/DmBchxylpServiceImpl.java new file mode 100644 index 0000000..dcf0b40 --- /dev/null +++ b/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; + +/** + *

+ * 服务实现类 + *

+ * + * @author xn + * @since 2023-09-19 + */ +@Service +public class DmBchxylpServiceImpl extends ServiceImpl implements DmBchxylpService { + + @Autowired + DmBchxylpMapper dmBchxylpMapper; + @Override + public List getBcTJlList(Map map) { + return dmBchxylpMapper.getBcTJlList(map); + } +} diff --git a/src/main/java/com/dsic/gj_erp/service/jcsj/impl/DmBclqjbpServiceImpl.java b/src/main/java/com/dsic/gj_erp/service/jcsj/impl/DmBclqjbpServiceImpl.java new file mode 100644 index 0000000..ada8d9e --- /dev/null +++ b/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; + +/** + *

+ * 服务实现类 + *

+ * + * @author xn + * @since 2023-09-15 + */ +@Service +public class DmBclqjbpServiceImpl extends ServiceImpl implements DmBclqjbpService { + +} diff --git a/src/main/java/com/dsic/gj_erp/service/jcsj/impl/DmBclqmxpServiceImpl.java b/src/main/java/com/dsic/gj_erp/service/jcsj/impl/DmBclqmxpServiceImpl.java new file mode 100644 index 0000000..1be636c --- /dev/null +++ b/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; + +/** + *

+ * 服务实现类 + *

+ * + * @author xn + * @since 2023-09-15 + */ +@Service +public class DmBclqmxpServiceImpl extends ServiceImpl implements DmBclqmxpService { + + @Autowired + DmBclqmxpMapper dmBclqmxpMapper; + @Override + public List getBcLQlList(Map map) { + List 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; + } +} diff --git a/src/main/java/com/dsic/gj_erp/service/jcsj/impl/DmBomServiceImpl.java b/src/main/java/com/dsic/gj_erp/service/jcsj/impl/DmBomServiceImpl.java new file mode 100644 index 0000000..895222b --- /dev/null +++ b/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; + +/** + *

+ * 服务实现类 + *

+ * + * @author xn + * @since 2023-09-25 + */ +@Service +public class DmBomServiceImpl extends ServiceImpl implements DmBomService { + + @Autowired + BomUploadServiceImpl bomUploadService; + @Override + public List getListBom(Map map) throws CustomException { + List list = this.list(new QueryWrapper().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 map) throws CustomException { + map.forEach(e->{ + baseMapper.insertBom(e); + }); + + } +} diff --git a/src/main/java/com/dsic/gj_erp/service/jcsj/impl/DmCbxxpServiceImpl.java b/src/main/java/com/dsic/gj_erp/service/jcsj/impl/DmCbxxpServiceImpl.java index 43add66..93545b5 100644 --- a/src/main/java/com/dsic/gj_erp/service/jcsj/impl/DmCbxxpServiceImpl.java +++ b/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; diff --git a/src/main/java/com/dsic/gj_erp/service/jcsj/impl/DmCzplpNewServiceImpl.java b/src/main/java/com/dsic/gj_erp/service/jcsj/impl/DmCzplpNewServiceImpl.java index dd8ff88..511446f 100644 --- a/src/main/java/com/dsic/gj_erp/service/jcsj/impl/DmCzplpNewServiceImpl.java +++ b/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 list, String project, String isupload, HttpServletRequest req) { Map returnMap = new HashMap(); - List fds = list.stream().filter(f -> StringUtils.isNotBlank(f.getDcPL())).map(PlExcel::getDcPL).collect(Collectors.toList()); - List fdList = this.list(new QueryWrapper().in("dc_fd", fds)); + List pls = list.stream().filter(f -> StringUtils.isNotBlank(f.getDcPL())).map(PlExcel::getDcPL).collect(Collectors.toList()); + List fdList = this.list(new QueryWrapper().in("dc_pl", pls)); // if(fdList.size()>0){ // // 是否覆盖之前导入的数据 // if(!isupload.equals("01")){ @@ -70,19 +74,19 @@ public class DmCzplpNewServiceImpl extends ServiceImpl 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().eq("dc_fd", plExcel.getDcPL())); + this.remove(new QueryWrapper().eq("dc_pl", plExcel.getDcPL())); for (int i = 1; i 0) { this.saveBatch(dmCzplpNews); + Listtzjhs=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 getCzplList(Map map) { QueryWrapper 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 list = this.list(qw); return list; } diff --git a/src/main/java/com/dsic/gj_erp/service/jcsj/impl/DmCzplpServiceImpl.java b/src/main/java/com/dsic/gj_erp/service/jcsj/impl/DmCzplpServiceImpl.java index a3be37a..ab13cdb 100644 --- a/src/main/java/com/dsic/gj_erp/service/jcsj/impl/DmCzplpServiceImpl.java +++ b/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; /** diff --git a/src/main/java/com/dsic/gj_erp/service/jcsj/impl/DmWlqdServiceImpl.java b/src/main/java/com/dsic/gj_erp/service/jcsj/impl/DmWlqdServiceImpl.java new file mode 100644 index 0000000..703a35d --- /dev/null +++ b/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; + +/** + *

+ * 服务实现类 + *

+ * + * @author xn + * @since 2023-09-21 + */ +@Service +public class DmWlqdServiceImpl extends ServiceImpl implements DmWlqdService { + + @Autowired + DmWlqdMapper dmWlqdMapper; + + @Override + public List getLJQDList(Map map) { + return dmWlqdMapper.getLJQDList(map); + } +} diff --git a/src/main/java/com/dsic/gj_erp/service/jcsj/impl/DmWpjbpServiceImpl.java b/src/main/java/com/dsic/gj_erp/service/jcsj/impl/DmWpjbpServiceImpl.java new file mode 100644 index 0000000..2b2758c --- /dev/null +++ b/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; + +/** + *

+ * 服务实现类 + *

+ * + * @author xn + * @since 2023-09-21 + */ +@Service +public class DmWpjbpServiceImpl extends ServiceImpl implements DmWpjbpService { + +} diff --git a/src/main/java/com/dsic/gj_erp/util/CodeGenerator.java b/src/main/java/com/dsic/gj_erp/util/CodeGenerator.java index d4f73cb..c2f147e 100644 --- a/src/main/java/com/dsic/gj_erp/util/CodeGenerator.java +++ b/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文件的目录 // diff --git a/src/main/java/com/dsic/gj_erp/util/MyFileUtil.java b/src/main/java/com/dsic/gj_erp/util/MyFileUtil.java new file mode 100644 index 0000000..bcf481d --- /dev/null +++ b/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(); + } +} diff --git a/src/main/resources/application-dev.properties b/src/main/resources/application-dev.properties index 5710b45..3abe729 100644 --- a/src/main/resources/application-dev.properties +++ b/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 diff --git a/src/main/resources/mappers/jcsj/DmBchxjbpMapper.xml b/src/main/resources/mappers/jcsj/DmBchxjbpMapper.xml new file mode 100644 index 0000000..fe27346 --- /dev/null +++ b/src/main/resources/mappers/jcsj/DmBchxjbpMapper.xml @@ -0,0 +1,48 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + + diff --git a/src/main/resources/mappers/jcsj/DmBchxmxpMapper.xml b/src/main/resources/mappers/jcsj/DmBchxmxpMapper.xml new file mode 100644 index 0000000..bbc0077 --- /dev/null +++ b/src/main/resources/mappers/jcsj/DmBchxmxpMapper.xml @@ -0,0 +1,135 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + + + + 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 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} + + + + + + diff --git a/src/main/resources/mappers/jcsj/DmBchxylpMapper.xml b/src/main/resources/mappers/jcsj/DmBchxylpMapper.xml new file mode 100644 index 0000000..8e417b3 --- /dev/null +++ b/src/main/resources/mappers/jcsj/DmBchxylpMapper.xml @@ -0,0 +1,105 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + + + + diff --git a/src/main/resources/mappers/jcsj/DmBclqjbpMapper.xml b/src/main/resources/mappers/jcsj/DmBclqjbpMapper.xml new file mode 100644 index 0000000..628baa7 --- /dev/null +++ b/src/main/resources/mappers/jcsj/DmBclqjbpMapper.xml @@ -0,0 +1,47 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + + diff --git a/src/main/resources/mappers/jcsj/DmBclqmxpMapper.xml b/src/main/resources/mappers/jcsj/DmBclqmxpMapper.xml new file mode 100644 index 0000000..ac07be3 --- /dev/null +++ b/src/main/resources/mappers/jcsj/DmBclqmxpMapper.xml @@ -0,0 +1,127 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + + + + diff --git a/src/main/resources/mappers/jcsj/DmBomMapper.xml b/src/main/resources/mappers/jcsj/DmBomMapper.xml new file mode 100644 index 0000000..71aaf48 --- /dev/null +++ b/src/main/resources/mappers/jcsj/DmBomMapper.xml @@ -0,0 +1,185 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + + + 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 (#{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} + ) + + + + + + + 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} + ) + + + + + + + diff --git a/src/main/resources/mappers/jcsj/DmWlqdMapper.xml b/src/main/resources/mappers/jcsj/DmWlqdMapper.xml new file mode 100644 index 0000000..9afb79d --- /dev/null +++ b/src/main/resources/mappers/jcsj/DmWlqdMapper.xml @@ -0,0 +1,136 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + + + + diff --git a/src/main/resources/mappers/jcsj/DmWpjbpMapper.xml b/src/main/resources/mappers/jcsj/DmWpjbpMapper.xml new file mode 100644 index 0000000..82697ea --- /dev/null +++ b/src/main/resources/mappers/jcsj/DmWpjbpMapper.xml @@ -0,0 +1,164 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + +