diff --git a/src/main/java/com/glxp/api/controller/basic/UdiRlSupController.java b/src/main/java/com/glxp/api/controller/basic/UdiRlSupController.java index 5f80a389..89554a6a 100644 --- a/src/main/java/com/glxp/api/controller/basic/UdiRlSupController.java +++ b/src/main/java/com/glxp/api/controller/basic/UdiRlSupController.java @@ -274,18 +274,33 @@ public class UdiRlSupController extends BaseController { if (vailResult != null) return ResultVOUtils.error(500, vailResult); companyProductsRelService.insertCompanyProducts(udiInfoExportRequest); - UdiRelevanceEntity udiRelevanceEntity = new UdiRelevanceEntity(); udiRelevanceEntity.setId(Long.parseLong(rlidStr)); udiRelevanceEntity.setLockStatus(1); udiRelevanceEntity.setGroupBuy(udiInfoExportRequest.getSupplementRequest().getGroupBuy()); + udiRelevanceEntity.setUpdateTime(new Date()); udiRelevanceService.updateUdiRelevance(udiRelevanceEntity); UdiProductEntity udiProductEntity = new UdiProductEntity(); BeanUtil.copyProperties(udiInfoExportRequest.getSupplementRequest(), udiProductEntity); //处理是否需要扫码字段 classifyCodeService.updateRequireScanCode(udiProductEntity); - udiProductEntity.setId(IdUtil.getSnowflakeNextId()); - udiProductService.insertUdiInfo(udiProductEntity); + udiProductEntity.setUpdateTime(new Date()); + UdiRelevanceEntity udiRelevanceEntity1 = udiRelevanceService.selectById(Long.valueOf(rlidStr)); + UdiProductEntity byUuid = udiProductService.findByUuid(udiRelevanceEntity1.getUuid()); + if (byUuid != null) { + byUuid.setCatalogname1(udiProductEntity.getCatalogname1()); + byUuid.setCatalogname2(udiProductEntity.getCatalogname2()); + byUuid.setCatalogname3(udiProductEntity.getCatalogname3()); + byUuid.setYbbm(udiProductEntity.getYbbm()); + byUuid.setManufactory(udiProductEntity.getManufactory()); + byUuid.setUpdateTime(new Date()); + udiProductService.updateUdiInfo(byUuid); + } else { + udiProductEntity.setId(IdUtil.getSnowflakeNextId()); + udiProductService.insertUdiInfo(udiProductEntity); + } +// udiProductEntity.setId(IdUtil.getSnowflakeNextId()); +// udiProductService.insertUdiInfo(udiProductEntity); return ResultVOUtils.success("选入成功！"); } diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThrProductsAddDiController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrProductsAddDiController.java index f86b0a26..2fe8b24c 100644 --- a/src/main/java/com/glxp/api/controller/thrsys/ThrProductsAddDiController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrProductsAddDiController.java @@ -40,11 +40,10 @@ import com.glxp.api.service.system.SystemParamConfigService; import com.glxp.api.service.thrsys.ThrProductsService; import com.glxp.api.service.thrsys.ThrSystemService; import com.glxp.api.service.thrsys.impl.ThrProductsAddDiService; -import com.glxp.api.util.CustomUtil; -import com.glxp.api.util.GennerOrderUtils; -import com.glxp.api.util.IntUtil; -import com.glxp.api.util.SupplementVailUtil; +import com.glxp.api.util.*; +import com.sun.jdi.PathSearchingVirtualMachine; import lombok.extern.slf4j.Slf4j; +import org.junit.Test; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import org.springframework.web.context.request.RequestContextHolder; @@ -53,6 +52,7 @@ import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; +import javax.validation.Valid; import java.io.File; import java.math.BigDecimal; import java.util.Date; @@ -227,6 +227,11 @@ public class ThrProductsAddDiController { udiProductEntity.setBasicPrductRemak6(thrProductsAddDiEntity.getBasicPrductRemak6()); udiProductEntity.setBasicPrductRemak7(thrProductsAddDiEntity.getBasicPrductRemak7()); udiProductEntity.setBasicPrductRemak8(thrProductsAddDiEntity.getBasicPrductRemak8()); + udiProductEntity.setBasicPrductRemak9(thrProductsAddDiEntity.getBasicPrductRemak9()); + udiProductEntity.setBasicPrductRemak10(thrProductsAddDiEntity.getBasicPrductRemak10()); + udiProductEntity.setBasicPrductRemak11(thrProductsAddDiEntity.getBasicPrductRemak11()); + udiProductEntity.setBasicPrductRemak12(thrProductsAddDiEntity.getBasicPrductRemak12()); + udiProductEntity.setBasicPrductRemak13(thrProductsAddDiEntity.getBasicPrductRemak13()); udiProductEntity.setGroupBuy(thrProductsAddDiEntity.getGroupBuy()); udiProductEntity.setCatalogname1(thrProductsAddDiEntity.getCatalogname1()); udiProductEntity.setCatalogname2(thrProductsAddDiEntity.getCatalogname2()); @@ -249,6 +254,13 @@ public class ThrProductsAddDiController { udiRelevanceEntity.setSupName(thrProductsAddDiEntity.getSupName()); udiRelevanceEntity.setIsDisable(false); udiRelevanceEntity.setNewNeedUpload(true); + Integer isStack = thrProductsAddDiEntity.getIsStack(); + if (isStack == 1){ + udiRelevanceEntity.setIsStack(true); + }else { + udiRelevanceEntity.setIsStack(false); + } + // udiProductEntity.setNameCode(null); udiProductService.insertUdiInfo(udiProductEntity); udiRelevanceService.insertUdiRelevance(udiRelevanceEntity); @@ -322,6 +334,11 @@ public class ThrProductsAddDiController { udiProductEntity.setBasicPrductRemak6(thrProductsAddDiResponse.getBasicPrductRemak6()); udiProductEntity.setBasicPrductRemak7(thrProductsAddDiResponse.getBasicPrductRemak7()); udiProductEntity.setBasicPrductRemak8(thrProductsAddDiResponse.getBasicPrductRemak8()); + udiProductEntity.setBasicPrductRemak9(thrProductsAddDiEntity.getBasicPrductRemak9()); + udiProductEntity.setBasicPrductRemak10(thrProductsAddDiEntity.getBasicPrductRemak10()); + udiProductEntity.setBasicPrductRemak11(thrProductsAddDiEntity.getBasicPrductRemak11()); + udiProductEntity.setBasicPrductRemak12(thrProductsAddDiEntity.getBasicPrductRemak12()); + udiProductEntity.setBasicPrductRemak13(thrProductsAddDiEntity.getBasicPrductRemak13()); udiProductEntity.setGroupBuy(thrProductsAddDiResponse.getGroupBuy()); udiProductEntity.setCatalogname1(thrProductsAddDiResponse.getCatalogname1()); udiProductEntity.setCatalogname2(thrProductsAddDiResponse.getCatalogname2()); @@ -331,6 +348,12 @@ public class ThrProductsAddDiController { udiRelevanceEntity.setPurType(thrProductsAddDiResponse.getPurType()); udiRelevanceEntity.setAttributeType(thrProductsAddDiResponse.getAttributeType()); udiRelevanceEntity.setHcType(thrProductsAddDiResponse.getHcType()); + Integer isStack = thrProductsAddDiEntity.getIsStack(); + if (isStack == 1){ + udiRelevanceEntity.setIsStack(true); + }else { + udiRelevanceEntity.setIsStack(false); + } udiProductEntity.setRequireCost(requireCost); String flbm = thrProductsAddDiResponse.getFlbm(); @@ -493,6 +516,13 @@ public class ThrProductsAddDiController { return ResultVOUtils.success(); } + @Test + public void dddd(){ + String value = "1"; + BigDecimal bigDecimal1 = new BigDecimal(value); + BigDecimal scaledValue1 = bigDecimal1.setScale(3, BigDecimal.ROUND_HALF_UP); + System.out.println("shucu :::::::" + scaledValue1); + } /** * 更新DI产品信息 diff --git a/src/main/java/com/glxp/api/entity/basic/BasicProductsEntity.java b/src/main/java/com/glxp/api/entity/basic/BasicProductsEntity.java index 170ad0d0..9df8396c 100644 --- a/src/main/java/com/glxp/api/entity/basic/BasicProductsEntity.java +++ b/src/main/java/com/glxp/api/entity/basic/BasicProductsEntity.java @@ -322,6 +322,37 @@ public class BasicProductsEntity { @TableField(value = "basicPrductRemak8") private String basicPrductRemak8; + + /** + * 备注字段9 + */ + @TableField(value = "basicPrductRemak9") + private String basicPrductRemak9; + + /** + * 备注字段10 + */ + @TableField(value = "basicPrductRemak10") + private String basicPrductRemak10; + + /** + * 备注字段11 + */ + @TableField(value = "basicPrductRemak11") + private String basicPrductRemak11; + + /** + * 备注字段12 + */ + @TableField(value = "basicPrductRemak12") + private String basicPrductRemak12; + + /** + * 备注字段13 + */ + @TableField(value = "basicPrductRemak13") + private String basicPrductRemak13; + /** * 创建时间 */ diff --git a/src/main/java/com/glxp/api/entity/thrsys/ThrProductsAddDiEntity.java b/src/main/java/com/glxp/api/entity/thrsys/ThrProductsAddDiEntity.java index 876b8be0..99b22d38 100644 --- a/src/main/java/com/glxp/api/entity/thrsys/ThrProductsAddDiEntity.java +++ b/src/main/java/com/glxp/api/entity/thrsys/ThrProductsAddDiEntity.java @@ -174,6 +174,27 @@ public class ThrProductsAddDiEntity { @ApiModelProperty(value = "备注字段8") private String basicPrductRemak8; + @TableField(value = "basicPrductRemak9") + @ApiModelProperty(value = "备注字段9") + private String basicPrductRemak9; + + @TableField(value = "basicPrductRemak10") + @ApiModelProperty(value = "备注字段10") + private String basicPrductRemak10; + + @TableField(value = "basicPrductRemak11") + @ApiModelProperty(value = "备注字段11") + private String basicPrductRemak11; + + @TableField(value = "basicPrductRemak12") + @ApiModelProperty(value = "备注字段12") + private String basicPrductRemak12; + + @TableField(value = "basicPrductRemak13") + @ApiModelProperty(value = "备注字段13") + private String basicPrductRemak13; + + /** * 通用名称 */ diff --git a/src/main/java/com/glxp/api/req/basic/UdiInfoRequest.java b/src/main/java/com/glxp/api/req/basic/UdiInfoRequest.java index 18516b8f..a6384677 100644 --- a/src/main/java/com/glxp/api/req/basic/UdiInfoRequest.java +++ b/src/main/java/com/glxp/api/req/basic/UdiInfoRequest.java @@ -81,6 +81,11 @@ public class UdiInfoRequest { private String basicPrductRemak6; private String basicPrductRemak7; private String basicPrductRemak8; + private String basicPrductRemak9; + private String basicPrductRemak10; + private String basicPrductRemak11; + private String basicPrductRemak12; + private String basicPrductRemak13; private String sfwblztlcp; private String cgzmraqxgxx; diff --git a/src/main/java/com/glxp/api/req/thrsys/AddThrDiProductsRequest.java b/src/main/java/com/glxp/api/req/thrsys/AddThrDiProductsRequest.java index 71a73457..4196967d 100644 --- a/src/main/java/com/glxp/api/req/thrsys/AddThrDiProductsRequest.java +++ b/src/main/java/com/glxp/api/req/thrsys/AddThrDiProductsRequest.java @@ -48,6 +48,11 @@ public class AddThrDiProductsRequest { private String basicPrductRemak6; private String basicPrductRemak7; private String basicPrductRemak8; + private String basicPrductRemak9; + private String basicPrductRemak10; + private String basicPrductRemak11; + private String basicPrductRemak12; + private String basicPrductRemak13; private String deviceRecordKey; private Boolean groupBuy; diff --git a/src/main/java/com/glxp/api/res/thrsys/UdiInfoResponse.java b/src/main/java/com/glxp/api/res/thrsys/UdiInfoResponse.java index 39894797..1d16ad09 100644 --- a/src/main/java/com/glxp/api/res/thrsys/UdiInfoResponse.java +++ b/src/main/java/com/glxp/api/res/thrsys/UdiInfoResponse.java @@ -99,6 +99,12 @@ public class UdiInfoResponse { private String basicPrductRemak6; private String basicPrductRemak7; private String basicPrductRemak8; + private String basicPrductRemak9; + private String basicPrductRemak10; + private String basicPrductRemak11; + private String basicPrductRemak12; + private String basicPrductRemak13; + private String remark; private String hslbName; diff --git a/src/main/java/com/glxp/api/service/basic/CompanyProductsRelService.java b/src/main/java/com/glxp/api/service/basic/CompanyProductsRelService.java index cb4282bb..59d70711 100644 --- a/src/main/java/com/glxp/api/service/basic/CompanyProductsRelService.java +++ b/src/main/java/com/glxp/api/service/basic/CompanyProductsRelService.java @@ -40,6 +40,7 @@ public class CompanyProductsRelService { SupplementRequest supplementRequest = udiInfoExportRequest.getSupplementRequest(); BeanUtil.copyProperties(udiInfoExportRequest.getSupplementRequest(), udiInfoRequest); BeanUtil.copyProperties(supplementRequest, udiRelevanceEntity); + udiRelevanceEntity.setUpdateTime(new Date()); udiRelevanceService.updateUdiRelevance(udiRelevanceEntity); udiProductService.updateUdiInfoNotAll(udiInfoRequest); companyProductRelevanceEntity.setCreateTime(new Date()); diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsAddDiService.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsAddDiService.java index dfd8b907..5ea4c284 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsAddDiService.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsAddDiService.java @@ -151,6 +151,12 @@ public class ThrProductsAddDiService extends ServiceImpl= 7 && !catalogcode.contains("CJ")) { @@ -195,16 +201,21 @@ public class ThrProductsAddDiService extends ServiceImpl().eq("hsbm", thrProductsAddDiEntity.getBasicPrductRemak8()).last("limit 1")); - udiInfoResponse.setHslbName(thrHslbEntity.getHsmc()); - } +// if (StrUtil.isNotEmpty(thrProductsAddDiEntity.getBasicPrductRemak8())) { +// ThrHslbEntity thrHslbEntity = thrHslbMapper.selectOne(new QueryWrapper().eq("hsbm", thrProductsAddDiEntity.getBasicPrductRemak8()).last("limit 1")); +// udiInfoResponse.setHslbName(thrHslbEntity.getHsmc()); +// } } return udiInfoResponse; } diff --git a/src/main/java/com/glxp/api/util/SupplementVailUtil.java b/src/main/java/com/glxp/api/util/SupplementVailUtil.java index 91c8acc3..fb22a831 100644 --- a/src/main/java/com/glxp/api/util/SupplementVailUtil.java +++ b/src/main/java/com/glxp/api/util/SupplementVailUtil.java @@ -185,6 +185,51 @@ public class SupplementVailUtil { } } } + basicProductSetEntity = basicProductSetEntityMap.get("basicPrductRemak9"); + if (isMustFill(type, basicProductSetEntity)) { + if (StrUtil.isEmpty(supplementRequest.getBasicPrductRemak8())) { + SystemParamConfigEntity systemParamConfigEntity = systemParamConfigEntityMap.get("basicPrductRemak9"); + if (!systemParamConfigEntity.getParamValue().equals("0")) { + return systemParamConfigEntity.getParamValue() + "不能为空"; + } + } + } + basicProductSetEntity = basicProductSetEntityMap.get("basicPrductRemak10"); + if (isMustFill(type, basicProductSetEntity)) { + if (StrUtil.isEmpty(supplementRequest.getBasicPrductRemak8())) { + SystemParamConfigEntity systemParamConfigEntity = systemParamConfigEntityMap.get("basicPrductRemak10"); + if (!systemParamConfigEntity.getParamValue().equals("0")) { + return systemParamConfigEntity.getParamValue() + "不能为空"; + } + } + } + basicProductSetEntity = basicProductSetEntityMap.get("basicPrductRemak11"); + if (isMustFill(type, basicProductSetEntity)) { + if (StrUtil.isEmpty(supplementRequest.getBasicPrductRemak8())) { + SystemParamConfigEntity systemParamConfigEntity = systemParamConfigEntityMap.get("basicPrductRemak11"); + if (!systemParamConfigEntity.getParamValue().equals("0")) { + return systemParamConfigEntity.getParamValue() + "不能为空"; + } + } + } + basicProductSetEntity = basicProductSetEntityMap.get("basicPrductRemak12"); + if (isMustFill(type, basicProductSetEntity)) { + if (StrUtil.isEmpty(supplementRequest.getBasicPrductRemak8())) { + SystemParamConfigEntity systemParamConfigEntity = systemParamConfigEntityMap.get("basicPrductRemak12"); + if (!systemParamConfigEntity.getParamValue().equals("0")) { + return systemParamConfigEntity.getParamValue() + "不能为空"; + } + } + } + basicProductSetEntity = basicProductSetEntityMap.get("basicPrductRemak13"); + if (isMustFill(type, basicProductSetEntity)) { + if (StrUtil.isEmpty(supplementRequest.getBasicPrductRemak8())) { + SystemParamConfigEntity systemParamConfigEntity = systemParamConfigEntityMap.get("basicPrductRemak13"); + if (!systemParamConfigEntity.getParamValue().equals("0")) { + return systemParamConfigEntity.getParamValue() + "不能为空"; + } + } + } } return null; } diff --git a/src/main/resources/mybatis/mapper/basic/UdiProductDao.xml b/src/main/resources/mybatis/mapper/basic/UdiProductDao.xml index b72a21f6..bb8d151d 100644 --- a/src/main/resources/mybatis/mapper/basic/UdiProductDao.xml +++ b/src/main/resources/mybatis/mapper/basic/UdiProductDao.xml @@ -189,7 +189,7 @@ allowNoBatch, allowNoExpire, allowNoProduct, allowNoSerial, spmc, cplx, hchzsb, cpdls, price, basicPrductRemak1, basicPrductRemak2, basicPrductRemak3, basicPrductRemak4, basicPrductRemak5, basicPrductRemak6, basicPrductRemak7, - basicPrductRemak8, updateTime + basicPrductRemak8, basicPrductRemak9,updateTime , sfwblztlcp, cgzmraqxgxx, sfbjwycxsy, zdcfsycs, sfwwjbz, syqsfxyjxmj, mjfs, categoryName, catalogname1, catalogname2, @@ -249,8 +249,9 @@ #{basicPrductRemak5}, #{basicPrductRemak6}, #{basicPrductRemak7}, - #{basicPrductRemak8}, #{updateTime} - , #{sfwblztlcp}, #{cgzmraqxgxx}, #{sfbjwycxsy}, #{zdcfsycs}, #{sfwwjbz}, #{syqsfxyjxmj}, #{mjfs}, + #{basicPrductRemak8}, + #{basicPrductRemak9}, + #{updateTime}, #{sfwblztlcp}, #{cgzmraqxgxx}, #{sfbjwycxsy}, #{zdcfsycs}, #{sfwwjbz}, #{syqsfxyjxmj}, #{mjfs}, #{categoryName}, #{catalogname1}, #{catalogname2}, @@ -510,6 +511,21 @@ basicPrductRemak8=#{basicPrductRemak8}, + + basicPrductRemak9=#{basicPrductRemak9}, + + + basicPrductRemak10=#{basicPrductRemak10}, + + + basicPrductRemak11=#{basicPrductRemak11}, + + + basicPrductRemak12=#{basicPrductRemak12}, + + + basicPrductRemak13=#{basicPrductRemak13}, + sfwblztlcp=#{sfwblztlcp}, @@ -699,6 +715,21 @@ basicPrductRemak8=#{basicPrductRemak8}, + + basicPrductRemak9=#{basicPrductRemak9}, + + + basicPrductRemak10=#{basicPrductRemak10}, + + + basicPrductRemak11=#{basicPrductRemak11}, + + + basicPrductRemak12=#{basicPrductRemak12}, + + + basicPrductRemak13=#{basicPrductRemak13}, + groupBuy=#{groupBuy}, @@ -1138,8 +1169,21 @@ basicPrductRemak8=#{basicPrductRemak8}, - - + + basicPrductRemak9=#{basicPrductRemak9}, + + + basicPrductRemak10=#{basicPrductRemak10}, + + + basicPrductRemak11=#{basicPrductRemak11}, + + + basicPrductRemak12=#{basicPrductRemak12}, + + + basicPrductRemak13=#{basicPrductRemak13}, + sfwblztlcp=#{sfwblztlcp}, diff --git a/src/main/resources/mybatis/mapper/thrsys/ThrProductsAddDiDao.xml b/src/main/resources/mybatis/mapper/thrsys/ThrProductsAddDiDao.xml index 16556e47..e0b9efda 100644 --- a/src/main/resources/mybatis/mapper/thrsys/ThrProductsAddDiDao.xml +++ b/src/main/resources/mybatis/mapper/thrsys/ThrProductsAddDiDao.xml @@ -11,7 +11,8 @@ price, selectThridSysStr, basicPrductRemak1, basicPrductRemak2, basicPrductRemak3, basicPrductRemak4, basicPrductRemak5, basicPrductRemak6, basicPrductRemak7, - basicPrductRemak8, `name`, spec, + basicPrductRemak8,basicPrductRemak9,basicPrductRemak10, + basicPrductRemak11,basicPrductRemak12,basicPrductRemak13,`name`, spec, registerNo, cplb, flbm, qxlb, tyshxydm, zczbhhzbapzbh, ylqxzcrbarmc, ylqxzcrbarywmc, updateTime, @@ -25,7 +26,7 @@ catalogCode1, catalogCode2, catalogCode3, - matrial, addStatus) + matrial, addStatus,isStack) values (#{item.uuid}, @@ -46,8 +47,7 @@ , #{item.basicPrductRemak1}, #{item.basicPrductRemak2}, #{item.basicPrductRemak3}, #{item.basicPrductRemak4} , #{item.basicPrductRemak5}, #{item.basicPrductRemak6}, #{item.basicPrductRemak7}, - #{item.basicPrductRemak8} - , #{item.name}, #{item.spec}, #{item.registerNo}, #{item.cplb} + #{item.basicPrductRemak8}, #{item.basicPrductRemak9}, #{item.basicPrductRemak10}, #{item.basicPrductRemak11}, #{item.basicPrductRemak12}, #{item.basicPrductRemak13},#{item.name}, #{item.spec}, #{item.registerNo}, #{item.cplb} , #{item.flbm}, #{item.qxlb}, #{item.tyshxydm}, #{item.zczbhhzbapzbh} , #{item.ylqxzcrbarmc}, #{item.ylqxzcrbarywmc}, #{item.updateTime}, #{item.supName}, #{item.model} , #{item.standard}, #{item.qtbm}, #{item.standard}, #{item.zczyxqz}, #{item.type}, @@ -58,7 +58,7 @@ #{item.catalogCode1}, #{item.catalogCode2}, #{item.catalogCode3}, - #{item.matrial}, #{item.addStatus}) + #{item.matrial}, #{item.addStatus},#{item.isStack})