Merge remote-tracking branch 'origin/orderChange' into orderChange

zhairh
anthonyywj2 3 years ago
commit 3938126fe3

@ -22,6 +22,7 @@ import com.glxp.sale.admin.entity.inventory.InvBusUserEntity;
import com.glxp.sale.admin.entity.inventory.InvSubWarehouseEntity; import com.glxp.sale.admin.entity.inventory.InvSubWarehouseEntity;
import com.glxp.sale.admin.entity.inventory.InvWarehouseEntity; import com.glxp.sale.admin.entity.inventory.InvWarehouseEntity;
import com.glxp.sale.admin.entity.thrsys.*; import com.glxp.sale.admin.entity.thrsys.*;
import com.glxp.sale.admin.req.basic.UdiInfoRequest;
import com.glxp.sale.admin.res.basic.SpsSyncBusResponse; import com.glxp.sale.admin.res.basic.SpsSyncBusResponse;
import com.glxp.sale.admin.res.basic.SpsSyncDataResponse; import com.glxp.sale.admin.res.basic.SpsSyncDataResponse;
import com.glxp.sale.admin.res.basic.SpsSyncOrderResponse; import com.glxp.sale.admin.res.basic.SpsSyncOrderResponse;
@ -214,7 +215,9 @@ public class SpsSyncUploadController {
List<UdiInfoEntity> udiInfoEntities = syncDataResponse.getUdiInfoEntities(); List<UdiInfoEntity> udiInfoEntities = syncDataResponse.getUdiInfoEntities();
UdiInfoDao mapper = batchSession.getMapper(UdiInfoDao.class); UdiInfoDao mapper = batchSession.getMapper(UdiInfoDao.class);
for (UdiInfoEntity udiInfoEntity : udiInfoEntities) { for (UdiInfoEntity udiInfoEntity : udiInfoEntities) {
mapper.insertUdiInfo(udiInfoEntity); UdiInfoRequest udiInfoRequest=new UdiInfoRequest();
BeanUtils.copyProperties(udiInfoEntity,udiInfoRequest);
mapper.insertUdiInfo(udiInfoRequest);
} }
batchSession.commit(); batchSession.commit();
} }

@ -14,6 +14,7 @@ import com.glxp.sale.admin.entity.receipt.ProductInfoEntity;
import com.glxp.sale.admin.entity.thrsys.ThrProductsEntity; import com.glxp.sale.admin.entity.thrsys.ThrProductsEntity;
import com.glxp.sale.admin.req.basic.CombineRequest; import com.glxp.sale.admin.req.basic.CombineRequest;
import com.glxp.sale.admin.req.basic.RemoveRelRequest; import com.glxp.sale.admin.req.basic.RemoveRelRequest;
import com.glxp.sale.admin.req.basic.UdiInfoRequest;
import com.glxp.sale.admin.req.receipt.ProductInfoFilterRequest; import com.glxp.sale.admin.req.receipt.ProductInfoFilterRequest;
import com.glxp.sale.admin.req.thrsys.FilterThrProductsRequest; import com.glxp.sale.admin.req.thrsys.FilterThrProductsRequest;
import com.glxp.sale.admin.res.PageSimpleResponse; import com.glxp.sale.admin.res.PageSimpleResponse;
@ -354,7 +355,9 @@ public class UdiContrastController {
udiInfoEntity.setScbssfbhsxrq("是"); udiInfoEntity.setScbssfbhsxrq("是");
udiInfoEntity.setScbssfbhxlh("否"); udiInfoEntity.setScbssfbhxlh("否");
udiInfoEntity = UdiInfoUtil.initUdiInfoEntity(udiInfoEntity); udiInfoEntity = UdiInfoUtil.initUdiInfoEntity(udiInfoEntity);
udiInfoService.insertUdiInfo(udiInfoEntity); UdiInfoRequest udiInfoRequest=new UdiInfoRequest();
BeanUtils.copyProperties(udiInfoEntity, udiInfoRequest);
udiInfoService.insertUdiInfo(udiInfoRequest);
} }
public void updateDi(UdiRelevanceEntity udiRelevanceEntity, String key) { public void updateDi(UdiRelevanceEntity udiRelevanceEntity, String key) {

@ -8,10 +8,7 @@ import com.github.pagehelper.PageInfo;
import com.glxp.sale.admin.annotation.AuthRuleAnnotation; import com.glxp.sale.admin.annotation.AuthRuleAnnotation;
import com.glxp.sale.admin.config.WebSocketServer; import com.glxp.sale.admin.config.WebSocketServer;
import com.glxp.sale.admin.constant.ConstantStatus; import com.glxp.sale.admin.constant.ConstantStatus;
import com.glxp.sale.admin.entity.basic.BasicThirdSysEntity; import com.glxp.sale.admin.entity.basic.*;
import com.glxp.sale.admin.entity.basic.FilterSysEntity;
import com.glxp.sale.admin.entity.basic.UdiInfoEntity;
import com.glxp.sale.admin.entity.basic.UdiRelevanceEntity;
import com.glxp.sale.admin.entity.info.CompanyProductRelevanceEntity; import com.glxp.sale.admin.entity.info.CompanyProductRelevanceEntity;
import com.glxp.sale.admin.entity.inout.WarehouseEntity; import com.glxp.sale.admin.entity.inout.WarehouseEntity;
import com.glxp.sale.admin.entity.inventory.InvProductEntity; import com.glxp.sale.admin.entity.inventory.InvProductEntity;
@ -306,14 +303,18 @@ public class UdiRelevanceController {
} }
} }
UdiInfoEntity udiInfoEntity = new UdiInfoEntity(); UdiInfoRequest udiInfoEntity = new UdiInfoRequest();
udiInfoEntity.setSptm(udiRelevanceResponse.getSptm()); udiInfoEntity.setSptm(udiRelevanceResponse.getSptm());
udiInfoEntity.setYbbm(udiRelevanceResponse.getYbbm()); udiInfoEntity.setYbbm(udiRelevanceResponse.getYbbm());
udiInfoEntity.setMeasname(udiRelevanceResponse.getMeasname()); udiInfoEntity.setMeasname(udiRelevanceResponse.getMeasname());
udiInfoEntity.setManufactory(udiRelevanceResponse.getManufactory()); udiInfoEntity.setManufactory(udiRelevanceResponse.getManufactory());
udiInfoEntity.setCpms(udiRelevanceResponse.getCpms()); udiInfoEntity.setCpms(udiRelevanceResponse.getCpms());
// udiInfoEntity.setDiType(udiRelevanceResponse.getDiType());
udiInfoEntity.setPrice(udiRelevanceResponse.getPrice()); udiInfoEntity.setPrice(udiRelevanceResponse.getPrice());
udiInfoEntity.setSpmc(udiRelevanceResponse.getSpmc()); udiInfoEntity.setSpmc(udiRelevanceResponse.getSpmc());
udiInfoEntity.setAllowNoBatch(udiRelevanceResponse.isAllowNoBatch());
udiInfoEntity.setAllowNoExpire(udiRelevanceResponse.isAllowNoExpire());
udiInfoEntity.setAllowNoProduct(udiRelevanceResponse.isAllowNoProduct());
udiInfoEntity.setBasicPrductRemak1(udiRelevanceResponse.getBasicPrductRemak1()); udiInfoEntity.setBasicPrductRemak1(udiRelevanceResponse.getBasicPrductRemak1());
udiInfoEntity.setBasicPrductRemak2(udiRelevanceResponse.getBasicPrductRemak2()); udiInfoEntity.setBasicPrductRemak2(udiRelevanceResponse.getBasicPrductRemak2());
udiInfoEntity.setBasicPrductRemak3(udiRelevanceResponse.getBasicPrductRemak3()); udiInfoEntity.setBasicPrductRemak3(udiRelevanceResponse.getBasicPrductRemak3());
@ -505,7 +506,7 @@ public class UdiRelevanceController {
String time = DateUtil.getDateTime(); String time = DateUtil.getDateTime();
udiRelevanceEntity.setUpdateTime(time); udiRelevanceEntity.setUpdateTime(time);
udiRelevanceEntity.setModifyTime(time); udiRelevanceEntity.setModifyTime(time);
UdiInfoEntity udiInfoEntity = new UdiInfoEntity(); UdiInfoRequest udiInfoEntity = new UdiInfoRequest();
udiInfoEntity.setYbbm(postSmpUdiInfoRequest.getYbbm()); udiInfoEntity.setYbbm(postSmpUdiInfoRequest.getYbbm());
udiInfoEntity.setSptm(postSmpUdiInfoRequest.getSptm()); udiInfoEntity.setSptm(postSmpUdiInfoRequest.getSptm());
BeanUtils.copyProperties(postSmpUdiInfoRequest, udiInfoEntity); BeanUtils.copyProperties(postSmpUdiInfoRequest, udiInfoEntity);
@ -690,19 +691,19 @@ public class UdiRelevanceController {
} }
BasicThirdSysEntity basicThirdSysEntity = basicThirdSysService.selectMainThrSys(); BasicThirdSysEntity basicThirdSysEntity = basicThirdSysService.selectMainThrSys();
ThrProductsEntity thrProductsEntity = thrDataService.getProducts(udiRelevanceEntity.getMainId(), basicThirdSysEntity.getThirdId()); ThrProductsEntity thrProductsEntity = thrDataService.getProducts(udiRelevanceEntity.getMainId(), basicThirdSysEntity.getThirdId());
UdiInfoEntity udiInfoEntity = new UdiInfoEntity(); UdiInfoRequest UdiInfoRequest = new UdiInfoRequest();
BeanUtils.copyProperties(thrProductsEntity, udiInfoEntity); BeanUtils.copyProperties(thrProductsEntity, UdiInfoRequest);
udiInfoEntity.setNameCode(thrProductsEntity.getCode()); UdiInfoRequest.setNameCode(thrProductsEntity.getCode());
udiInfoEntity.setCpmctymc(thrProductsEntity.getName()); UdiInfoRequest.setCpmctymc(thrProductsEntity.getName());
udiInfoEntity.setManufactory(thrProductsEntity.getManufactory()); UdiInfoRequest.setManufactory(thrProductsEntity.getManufactory());
udiInfoEntity.setYlqxzcrbarmc(thrProductsEntity.getManufactory()); UdiInfoRequest.setYlqxzcrbarmc(thrProductsEntity.getManufactory());
udiInfoEntity.setGgxh(thrProductsEntity.getSpec()); UdiInfoRequest.setGgxh(thrProductsEntity.getSpec());
udiInfoEntity.setZczbhhzbapzbh(thrProductsEntity.getRegisterNo()); UdiInfoRequest.setZczbhhzbapzbh(thrProductsEntity.getRegisterNo());
udiInfoEntity.setUuid(CustomUtil.getUUId()); UdiInfoRequest.setUuid(CustomUtil.getUUId());
udiInfoEntity.setProductType(ConstantStatus.PRODUCT_TYPE_THIRD); UdiInfoRequest.setProductType(ConstantStatus.PRODUCT_TYPE_THIRD);
udiInfoEntity.setDiType(1); UdiInfoRequest.setDiType(1);
udiInfoService.insertUdiInfo(udiInfoEntity); udiInfoService.insertUdiInfo(UdiInfoRequest);
udiRelevanceEntity.setUuid(udiInfoEntity.getUuid()); udiRelevanceEntity.setUuid(UdiInfoRequest.getUuid());
String time = DateUtil.getDateTime(); String time = DateUtil.getDateTime();
udiRelevanceEntity.setUpdateTime(time); udiRelevanceEntity.setUpdateTime(time);
udiRelevanceEntity.setModifyTime(time); udiRelevanceEntity.setModifyTime(time);

@ -16,6 +16,7 @@ import com.glxp.sale.admin.exception.JsonException;
import com.glxp.sale.admin.req.basic.CombineRequest; import com.glxp.sale.admin.req.basic.CombineRequest;
import com.glxp.sale.admin.req.basic.FilterUdiInfoRequest; import com.glxp.sale.admin.req.basic.FilterUdiInfoRequest;
import com.glxp.sale.admin.req.basic.SupplementRequest; import com.glxp.sale.admin.req.basic.SupplementRequest;
import com.glxp.sale.admin.req.basic.UdiInfoRequest;
import com.glxp.sale.admin.req.inout.DeleteRequest; import com.glxp.sale.admin.req.inout.DeleteRequest;
import com.glxp.sale.admin.req.thrsys.AddThrDiProductsRequest; import com.glxp.sale.admin.req.thrsys.AddThrDiProductsRequest;
import com.glxp.sale.admin.req.thrsys.FilterThrProductsRequest; import com.glxp.sale.admin.req.thrsys.FilterThrProductsRequest;
@ -30,7 +31,6 @@ import com.glxp.sale.admin.service.basic.UdiRelevanceService;
import com.glxp.sale.admin.service.info.CompanyProductRelevanceService; import com.glxp.sale.admin.service.info.CompanyProductRelevanceService;
import com.glxp.sale.admin.service.thrsys.ThrProductsAddDiService; import com.glxp.sale.admin.service.thrsys.ThrProductsAddDiService;
import com.glxp.sale.admin.util.BeanUtils; import com.glxp.sale.admin.util.BeanUtils;
import com.glxp.sale.admin.util.FilterUdiUtils;
import com.glxp.sale.admin.util.SupplementVailUtil; import com.glxp.sale.admin.util.SupplementVailUtil;
import com.glxp.sale.common.enums.ResultEnum; import com.glxp.sale.common.enums.ResultEnum;
import com.glxp.sale.common.res.BaseResponse; import com.glxp.sale.common.res.BaseResponse;
@ -186,22 +186,24 @@ public class ThrProductsAddDiController {
udiRelevanceEntity.setManufactory(thrProductsAddDiEntity.getManufactory()); udiRelevanceEntity.setManufactory(thrProductsAddDiEntity.getManufactory());
UdiInfoEntity udiInfoEntity = udiInfoService.findByUuid(udiRelevanceEntity.getUuid()); UdiInfoEntity udiInfoEntity = udiInfoService.findByUuid(udiRelevanceEntity.getUuid());
udiInfoEntity.setSptm(thrProductsAddDiResponse.getSptm()); UdiInfoRequest udiInfoRequest=new UdiInfoRequest();
udiInfoEntity.setYbbm(thrProductsAddDiResponse.getYbbm()); BeanUtils.copyProperties(udiInfoEntity,udiInfoRequest);
udiInfoEntity.setMeasname(thrProductsAddDiResponse.getMeasname()); udiInfoRequest.setSptm(thrProductsAddDiResponse.getSptm());
udiInfoEntity.setManufactory(thrProductsAddDiResponse.getManufactory()); udiInfoRequest.setYbbm(thrProductsAddDiResponse.getYbbm());
udiInfoEntity.setSpmc(thrProductsAddDiResponse.getSpmc()); udiInfoRequest.setMeasname(thrProductsAddDiResponse.getMeasname());
udiInfoEntity.setCpms(thrProductsAddDiResponse.getCpms()); udiInfoRequest.setManufactory(thrProductsAddDiResponse.getManufactory());
udiInfoEntity.setPrice(thrProductsAddDiResponse.getPrice()); udiInfoRequest.setSpmc(thrProductsAddDiResponse.getSpmc());
udiInfoEntity.setBasicPrductRemak1(thrProductsAddDiResponse.getBasicPrductRemak1()); udiInfoRequest.setCpms(thrProductsAddDiResponse.getCpms());
udiInfoEntity.setBasicPrductRemak2(thrProductsAddDiResponse.getBasicPrductRemak2()); udiInfoRequest.setPrice(thrProductsAddDiResponse.getPrice());
udiInfoEntity.setBasicPrductRemak3(thrProductsAddDiResponse.getBasicPrductRemak3()); udiInfoRequest.setBasicPrductRemak1(thrProductsAddDiResponse.getBasicPrductRemak1());
udiInfoEntity.setBasicPrductRemak4(thrProductsAddDiResponse.getBasicPrductRemak4()); udiInfoRequest.setBasicPrductRemak2(thrProductsAddDiResponse.getBasicPrductRemak2());
udiInfoEntity.setBasicPrductRemak5(thrProductsAddDiResponse.getBasicPrductRemak5()); udiInfoRequest.setBasicPrductRemak3(thrProductsAddDiResponse.getBasicPrductRemak3());
udiInfoEntity.setBasicPrductRemak6(thrProductsAddDiResponse.getBasicPrductRemak6()); udiInfoRequest.setBasicPrductRemak4(thrProductsAddDiResponse.getBasicPrductRemak4());
udiInfoEntity.setBasicPrductRemak7(thrProductsAddDiResponse.getBasicPrductRemak7()); udiInfoRequest.setBasicPrductRemak5(thrProductsAddDiResponse.getBasicPrductRemak5());
udiInfoEntity.setBasicPrductRemak8(thrProductsAddDiResponse.getBasicPrductRemak8()); udiInfoRequest.setBasicPrductRemak6(thrProductsAddDiResponse.getBasicPrductRemak6());
udiInfoService.updateUdiInfo(udiInfoEntity); udiInfoRequest.setBasicPrductRemak7(thrProductsAddDiResponse.getBasicPrductRemak7());
udiInfoRequest.setBasicPrductRemak8(thrProductsAddDiResponse.getBasicPrductRemak8());
udiInfoService.updateUdiInfo(udiInfoRequest);
udiRelevanceService.updateUdiRelevance(udiRelevanceEntity); udiRelevanceService.updateUdiRelevance(udiRelevanceEntity);

@ -1,8 +1,8 @@
package com.glxp.sale.admin.dao.basic; package com.glxp.sale.admin.dao.basic;
import com.glxp.sale.admin.entity.basic.UdiInfoEntity; import com.glxp.sale.admin.entity.basic.UdiInfoEntity;
import com.glxp.sale.admin.entity.basic.UdiRelevanceEntity;
import com.glxp.sale.admin.req.basic.FilterUdiInfoRequest; import com.glxp.sale.admin.req.basic.FilterUdiInfoRequest;
import com.glxp.sale.admin.req.basic.UdiInfoRequest;
import com.glxp.sale.admin.res.basic.UdiRelevanceResponse; import com.glxp.sale.admin.res.basic.UdiRelevanceResponse;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
@ -24,11 +24,11 @@ public interface UdiInfoDao {
List<UdiInfoEntity> findByUuids(@Param("uuid") String uuid); List<UdiInfoEntity> findByUuids(@Param("uuid") String uuid);
boolean insertUdiInfo(UdiInfoEntity udiInfoEntity); boolean insertUdiInfo(UdiInfoRequest udiInfoEntity);
boolean insertUdiInfos(@Param("udiInfoEntities") List<UdiInfoEntity> udiInfoEntities); boolean insertUdiInfos(@Param("udiInfoEntities") List<UdiInfoEntity> udiInfoEntities);
boolean updateUdiInfo(UdiInfoEntity udiInfoEntity); boolean updateUdiInfo(UdiInfoRequest udiInfoRequest);
boolean deleteById(@Param("id") String id); boolean deleteById(@Param("id") String id);

@ -36,4 +36,5 @@ public interface ThrProductsAddDiDao {
/** 根据ID查询 */ /** 根据ID查询 */
ThrProductsAddDiEntity filterThrProductsGetId(@Param("id") Integer id); ThrProductsAddDiEntity filterThrProductsGetId(@Param("id") Integer id);
ThrProductsAddDiEntity filterThrProductsGetUuid(@Param("uuid") String uuid);
} }

@ -8,4 +8,6 @@ public class BusTypeChangeFilterRequest extends ListPageRequest {
private String action; private String action;
private String originAction; private String originAction;
private String originName;
private String targetName;
} }

@ -60,4 +60,6 @@ public class FilterUdiInfoRequest extends ListPageRequest {
private String originUuid; private String originUuid;
private String relId; private String relId;
private String companyName;
} }

@ -0,0 +1,83 @@
package com.glxp.sale.admin.req.basic;
import lombok.Data;
@Data
public class UdiInfoRequest {
private Integer id;
private String nameCode;
private String packRatio;
private String packLevel;
private Integer bhxjsl;
private Integer bhzxxsbzsl;
private Integer zxxsbzbhsydysl;
private String bhxjcpbm;
private String sjcpbm; //
private String bzcj;
private String addType;
private String deviceRecordKey;
private String cpmctymc;
private String cplb;
private String flbm;
private String ggxh;
private String qxlb;
private String tyshxydm;
private String ylqxzcrbarmc;
private String zczbhhzbapzbh;
private String ylqxzcrbarywmc;
private String sydycpbs;
private String uuid;
private Integer versionNumber;
private Integer diType;
private String thirdId;
private String thirdName;
private String ybbm;
private String sptm;
private String manufactory;
private String measname;
private Integer productType;
private String scbssfbhph;
private String scbssfbhxlh;
private String scbssfbhscrq;
private String scbssfbhsxrq;
private String cpms;
private String spmc;
private String originUuid;
//本地生成信息
private String batchNo;
private String produceDate;
private String expireDate;
private String serialNo;
private String udi;
private String code;
private Integer count;
private String warehouseCode;
private String udplatCode;
private String relId;//关联ID主键
private Integer status;
private String supId;
private Boolean isCheck;
private boolean allowNoBatch;
private boolean allowNoExpire;
private boolean allowNoProduct;
private String price;
private String cplx;
private String hchzsb;
//产品代理商
private String cpdls;
private String basicPrductRemak1;
private String basicPrductRemak2;
private String basicPrductRemak3;
private String basicPrductRemak4;
private String basicPrductRemak5;
private String basicPrductRemak6;
private String basicPrductRemak7;
private String basicPrductRemak8;
}

@ -0,0 +1,42 @@
package com.glxp.sale.admin.req.basic;
import lombok.Data;
@Data
public class UdiRelevanceRequest {
private String id;
private String thirdId;
private String thirdName;
private String uuid;
private Boolean isUseDy;
private String updateTime;
private String thirdId1;
private String thirdId2;
private String thirdId3;
private String thirdId4;
private String thirdName1;
private String thirdName2;
private String thirdName3;
private String thirdName4;
private String manufactory;
private String measname;
private String ybbm;
private String sptm;
private Boolean isDisable;
private Boolean isLock;
private String mainId;
private String mainName;
private Integer lockStatus;
private String udplatCode;
private Boolean isAdavence;
private String supName;
private String originUuid;
private String price;
private String modifyTime; //修改时间
private Boolean useMuti; //是否多次使用
private Integer useNum; //最小包装单元可使用次数
}

@ -102,8 +102,10 @@ public class PurApplyRequest extends ListPageRequest {
private String startDate; private String startDate;
private String endDate; private String endDate;
private Integer generatePlan;
private boolean audtoPlan; private boolean audtoPlan;
private Integer applyType;
} }

@ -3,6 +3,7 @@ package com.glxp.sale.admin.res.purchase;
import lombok.Data; import lombok.Data;
import java.util.Date; import java.util.Date;
import java.util.List;
@Data @Data
public class PurApplyResponse { public class PurApplyResponse {
@ -76,4 +77,8 @@ public class PurApplyResponse {
private String planBillNo; //生成采购计划单据号 private String planBillNo; //生成采购计划单据号
private boolean generatePlan; private boolean generatePlan;
private boolean audtoPlan; /// private boolean audtoPlan; ///
} }

@ -11,6 +11,7 @@ import com.glxp.sale.admin.entity.basic.UdiRelevanceEntity;
import com.glxp.sale.admin.entity.thrsys.ThrProductsEntity; import com.glxp.sale.admin.entity.thrsys.ThrProductsEntity;
import com.glxp.sale.admin.req.basic.CombineRequest; import com.glxp.sale.admin.req.basic.CombineRequest;
import com.glxp.sale.admin.req.basic.FilterUdiInfoRequest; import com.glxp.sale.admin.req.basic.FilterUdiInfoRequest;
import com.glxp.sale.admin.req.basic.UdiInfoRequest;
import com.glxp.sale.admin.req.thrsys.FilterThrProductsRequest; import com.glxp.sale.admin.req.thrsys.FilterThrProductsRequest;
import com.glxp.sale.admin.service.thrsys.ThrProductsService; import com.glxp.sale.admin.service.thrsys.ThrProductsService;
import com.glxp.sale.admin.thread.UdiDlHttpClient; import com.glxp.sale.admin.thread.UdiDlHttpClient;
@ -171,7 +172,9 @@ public class UdiContrastService {
udiInfoEntity.setScbssfbhsxrq("是"); udiInfoEntity.setScbssfbhsxrq("是");
udiInfoEntity.setScbssfbhxlh("否"); udiInfoEntity.setScbssfbhxlh("否");
udiInfoEntity = UdiInfoUtil.initUdiInfoEntity(udiInfoEntity); udiInfoEntity = UdiInfoUtil.initUdiInfoEntity(udiInfoEntity);
udiInfoService.insertUdiInfo(udiInfoEntity); UdiInfoRequest udiInfoRequest=new UdiInfoRequest();
BeanUtils.copyProperties(udiInfoEntity, udiInfoRequest);
udiInfoService.insertUdiInfo(udiInfoRequest);
} }
public long createOnlyUuid(CombineRequest combineRequest, String key) { public long createOnlyUuid(CombineRequest combineRequest, String key) {

@ -3,6 +3,7 @@ package com.glxp.sale.admin.service.basic;
import com.glxp.sale.admin.entity.basic.UdiInfoEntity; import com.glxp.sale.admin.entity.basic.UdiInfoEntity;
import com.glxp.sale.admin.req.basic.FilterUdiInfoRequest; import com.glxp.sale.admin.req.basic.FilterUdiInfoRequest;
import com.glxp.sale.admin.req.basic.UdiInfoRequest;
import com.glxp.sale.admin.res.basic.UdiRelevanceResponse; import com.glxp.sale.admin.res.basic.UdiRelevanceResponse;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
@ -27,11 +28,11 @@ public interface UdiInfoService {
List<UdiInfoEntity> findByUuids(String uuid); List<UdiInfoEntity> findByUuids(String uuid);
boolean insertUdiInfo(UdiInfoEntity udiInfoEntity); boolean insertUdiInfo(UdiInfoRequest udiInfoRequest);
boolean insertUdiInfos(List<UdiInfoEntity> udiInfoEntities); boolean insertUdiInfos(List<UdiInfoEntity> udiInfoEntities);
boolean updateUdiInfo(UdiInfoEntity udiInfoEntity); boolean updateUdiInfo(UdiInfoRequest udiInfoRequest);
boolean deleteById(String id); boolean deleteById(String id);

@ -11,12 +11,14 @@ import com.glxp.sale.admin.entity.basic.UdiInfoImportDetailEntity;
import com.glxp.sale.admin.entity.basic.UdiRelevanceEntity; import com.glxp.sale.admin.entity.basic.UdiRelevanceEntity;
import com.glxp.sale.admin.entity.thrsys.ThrProductsEntity; import com.glxp.sale.admin.entity.thrsys.ThrProductsEntity;
import com.glxp.sale.admin.req.basic.FilterUdiIpLogRequest; import com.glxp.sale.admin.req.basic.FilterUdiIpLogRequest;
import com.glxp.sale.admin.req.basic.UdiInfoRequest;
import com.glxp.sale.admin.res.basic.UdiRelevanceExportJsonResponse; import com.glxp.sale.admin.res.basic.UdiRelevanceExportJsonResponse;
import com.glxp.sale.admin.service.basic.UdiInfoImportDetailService; import com.glxp.sale.admin.service.basic.UdiInfoImportDetailService;
import org.apache.ibatis.session.ExecutorType; import org.apache.ibatis.session.ExecutorType;
import org.apache.ibatis.session.SqlSession; import org.apache.ibatis.session.SqlSession;
import org.apache.ibatis.session.SqlSessionFactory; import org.apache.ibatis.session.SqlSessionFactory;
import org.apache.ibatis.session.TransactionIsolationLevel; import org.apache.ibatis.session.TransactionIsolationLevel;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import javax.annotation.Resource; import javax.annotation.Resource;
@ -100,7 +102,9 @@ public class UdiInfoImportDetailServiceImpl implements UdiInfoImportDetailServic
List<UdiInfoEntity> corpList = udiRelevanceExportJsonResponse.getUdiInfoEntities(); List<UdiInfoEntity> corpList = udiRelevanceExportJsonResponse.getUdiInfoEntities();
UdiInfoDao mapper = batchSession.getMapper(UdiInfoDao.class); UdiInfoDao mapper = batchSession.getMapper(UdiInfoDao.class);
for (UdiInfoEntity basicUnitMaintainEntity : corpList) { for (UdiInfoEntity basicUnitMaintainEntity : corpList) {
mapper.insertUdiInfo(basicUnitMaintainEntity); UdiInfoRequest udiInfoRequest=new UdiInfoRequest();
BeanUtils.copyProperties(basicUnitMaintainEntity, udiInfoRequest);
mapper.insertUdiInfo(udiInfoRequest);
} }
batchSession.commit(); batchSession.commit();
} }

@ -5,8 +5,8 @@ import cn.hutool.core.util.StrUtil;
import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageHelper;
import com.glxp.sale.admin.dao.basic.UdiInfoDao; import com.glxp.sale.admin.dao.basic.UdiInfoDao;
import com.glxp.sale.admin.entity.basic.UdiInfoEntity; import com.glxp.sale.admin.entity.basic.UdiInfoEntity;
import com.glxp.sale.admin.entity.receipt.ProductInfoEntity;
import com.glxp.sale.admin.req.basic.FilterUdiInfoRequest; import com.glxp.sale.admin.req.basic.FilterUdiInfoRequest;
import com.glxp.sale.admin.req.basic.UdiInfoRequest;
import com.glxp.sale.admin.res.basic.UdiRelevanceResponse; import com.glxp.sale.admin.res.basic.UdiRelevanceResponse;
import com.glxp.sale.admin.service.basic.UdiInfoService; import com.glxp.sale.admin.service.basic.UdiInfoService;
import com.glxp.sale.admin.util.FilterUdiUtils; import com.glxp.sale.admin.util.FilterUdiUtils;
@ -92,8 +92,8 @@ public class UdiInfoServiceImpl implements UdiInfoService {
} }
@Override @Override
public boolean insertUdiInfo(UdiInfoEntity udiInfoEntity) { public boolean insertUdiInfo(UdiInfoRequest udiInfoRequest) {
return udiInfoDao.insertUdiInfo(udiInfoEntity); return udiInfoDao.insertUdiInfo(udiInfoRequest);
} }
@Override @Override
@ -102,10 +102,10 @@ public class UdiInfoServiceImpl implements UdiInfoService {
} }
@Override @Override
public boolean updateUdiInfo(UdiInfoEntity udiInfoEntity) { public boolean updateUdiInfo(UdiInfoRequest udiInfoRequest) {
if (StrUtil.isEmpty(udiInfoEntity.getUuid())) if (StrUtil.isEmpty(udiInfoRequest.getUuid()))
return false; return false;
return udiInfoDao.updateUdiInfo(udiInfoEntity); return udiInfoDao.updateUdiInfo(udiInfoRequest);
} }
@Override @Override

@ -95,7 +95,13 @@ public class ThrProductsAddDiServiceImpl implements ThrProductsAddDiService {
@Override @Override
public UdiInfoEntity getDiProductDetail(String uuid) { public UdiInfoEntity getDiProductDetail(String uuid) {
return thrProductsAddDiDao.getDiProductDetail(uuid); ThrProductsAddDiEntity thrProductsAddDiEntity=thrProductsAddDiDao.filterThrProductsGetUuid(uuid);
UdiInfoEntity udiInfoEntity=thrProductsAddDiDao.getDiProductDetail(uuid);
udiInfoEntity.setSptm(thrProductsAddDiEntity.getSptm());
udiInfoEntity.setYbbm(thrProductsAddDiEntity.getYbbm());
udiInfoEntity.setManufactory(thrProductsAddDiEntity.getManufactory());
udiInfoEntity.setCpms(thrProductsAddDiEntity.getCpms());
return udiInfoEntity;
} }
@Override @Override

@ -10,6 +10,7 @@ import com.glxp.sale.admin.entity.thrsys.ThrProductsEntity;
import com.glxp.sale.admin.httpclient.ErpBasicClient; import com.glxp.sale.admin.httpclient.ErpBasicClient;
import com.glxp.sale.admin.req.basic.FilterErpGoodsRequest; import com.glxp.sale.admin.req.basic.FilterErpGoodsRequest;
import com.glxp.sale.admin.req.basic.SpsSyncDataRequest; import com.glxp.sale.admin.req.basic.SpsSyncDataRequest;
import com.glxp.sale.admin.req.basic.UdiInfoRequest;
import com.glxp.sale.admin.req.thrsys.FilterThrProductsRequest; import com.glxp.sale.admin.req.thrsys.FilterThrProductsRequest;
import com.glxp.sale.admin.res.PageSimpleResponse; import com.glxp.sale.admin.res.PageSimpleResponse;
import com.glxp.sale.admin.res.basic.*; import com.glxp.sale.admin.res.basic.*;
@ -89,7 +90,7 @@ public class BasicBackUpdateProductService {
inventoryCodes.add(invmandocResponse.getCode()); inventoryCodes.add(invmandocResponse.getCode());
erpProductsMap.put(invmandocResponse.getCode(), invmandocResponse); erpProductsMap.put(invmandocResponse.getCode(), invmandocResponse);
if (isUpdate.getParamValue().equals("1")) {//不根据库存信息过滤 if (isUpdate.getParamValue().equals("1")) {//不根据库存信息过滤
UdiInfoEntity udiInfoEntity = new UdiInfoEntity(); UdiInfoRequest udiInfoEntity = new UdiInfoRequest();
udiInfoEntity.setNameCode(invmandocResponse.getCode()); udiInfoEntity.setNameCode(invmandocResponse.getCode());
udiInfoEntity.setCpmctymc(invmandocResponse.getName()); udiInfoEntity.setCpmctymc(invmandocResponse.getName());
udiInfoEntity.setGgxh(invmandocResponse.getSpec()); udiInfoEntity.setGgxh(invmandocResponse.getSpec());
@ -191,7 +192,7 @@ public class BasicBackUpdateProductService {
if (udiRelevanceEntity == null) { if (udiRelevanceEntity == null) {
if (isUpdate.getParamValue().equals("1")) { if (isUpdate.getParamValue().equals("1")) {
UdiInfoEntity udiInfoEntity = new UdiInfoEntity(); UdiInfoRequest udiInfoEntity = new UdiInfoRequest();
udiInfoEntity.setNameCode(thrProductsEntity.getCode()); udiInfoEntity.setNameCode(thrProductsEntity.getCode());
udiInfoEntity.setCpmctymc(thrProductsEntity.getName()); udiInfoEntity.setCpmctymc(thrProductsEntity.getName());
udiInfoEntity.setGgxh(thrProductsEntity.getSpec()); udiInfoEntity.setGgxh(thrProductsEntity.getSpec());

@ -8,6 +8,7 @@ import com.glxp.sale.admin.entity.basic.*;
import com.glxp.sale.admin.entity.param.SystemParamConfigEntity; import com.glxp.sale.admin.entity.param.SystemParamConfigEntity;
import com.glxp.sale.admin.entity.thrsys.ThrProductsEntity; import com.glxp.sale.admin.entity.thrsys.ThrProductsEntity;
import com.glxp.sale.admin.req.basic.FilterUdiIpLogRequest; import com.glxp.sale.admin.req.basic.FilterUdiIpLogRequest;
import com.glxp.sale.admin.req.basic.UdiInfoRequest;
import com.glxp.sale.admin.res.PageSimpleResponse; import com.glxp.sale.admin.res.PageSimpleResponse;
import com.glxp.sale.admin.res.basic.UdiRelevanceResponse; import com.glxp.sale.admin.res.basic.UdiRelevanceResponse;
import com.glxp.sale.admin.service.basic.*; import com.glxp.sale.admin.service.basic.*;
@ -112,7 +113,9 @@ public class BasicUdiInfoImportService {
udiInfoEntity.setManufactory(thrProductsEntity.getManufactory()); udiInfoEntity.setManufactory(thrProductsEntity.getManufactory());
udiInfoEntity.setYlqxzcrbarmc(thrProductsEntity.getManufactory()); udiInfoEntity.setYlqxzcrbarmc(thrProductsEntity.getManufactory());
udiInfoEntity.setZczbhhzbapzbh(thrProductsEntity.getRegisterNo()); udiInfoEntity.setZczbhhzbapzbh(thrProductsEntity.getRegisterNo());
udiInfoService.insertUdiInfo(udiInfoEntity); UdiInfoRequest udiInfoRequest=new UdiInfoRequest();
BeanUtils.copyProperties(udiInfoEntity, udiInfoRequest);
udiInfoService.insertUdiInfo(udiInfoRequest);
} else { } else {
udiInfoImportDetailEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_CODE_FAIL); udiInfoImportDetailEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_CODE_FAIL);

@ -13,6 +13,7 @@ import com.glxp.sale.admin.httpclient.ErpBasicClient;
import com.glxp.sale.admin.req.basic.CombineRequest; import com.glxp.sale.admin.req.basic.CombineRequest;
import com.glxp.sale.admin.req.basic.FilterUdiInfoRequest; import com.glxp.sale.admin.req.basic.FilterUdiInfoRequest;
import com.glxp.sale.admin.req.basic.UdiInfoExportRequest; import com.glxp.sale.admin.req.basic.UdiInfoExportRequest;
import com.glxp.sale.admin.req.basic.UdiInfoRequest;
import com.glxp.sale.admin.req.thrsys.FilterThrProductsRequest; import com.glxp.sale.admin.req.thrsys.FilterThrProductsRequest;
import com.glxp.sale.admin.res.PageSimpleResponse; import com.glxp.sale.admin.res.PageSimpleResponse;
import com.glxp.sale.admin.res.basic.ErpProductsResponse; import com.glxp.sale.admin.res.basic.ErpProductsResponse;
@ -92,7 +93,9 @@ public class BasicUpdateProductService {
udiInfoEntity.setUuid(CustomUtil.getUUId()); udiInfoEntity.setUuid(CustomUtil.getUUId());
udiInfoEntity.setProductType(ConstantStatus.PRODUCT_TYPE_THIRD); udiInfoEntity.setProductType(ConstantStatus.PRODUCT_TYPE_THIRD);
udiInfoEntity.setDiType(1); udiInfoEntity.setDiType(1);
udiInfoService.insertUdiInfo(udiInfoEntity); UdiInfoRequest udiInfoRequest=new UdiInfoRequest();
BeanUtils.copyProperties(udiInfoEntity, udiInfoRequest);
udiInfoService.insertUdiInfo(udiInfoRequest);
} }
udiRelevanceEntity1.setUuid(udiInfoEntity.getUuid()); udiRelevanceEntity1.setUuid(udiInfoEntity.getUuid());
udiRelevanceEntity1.setThirdName(thrProductsEntity.getName()); udiRelevanceEntity1.setThirdName(thrProductsEntity.getName());
@ -168,7 +171,9 @@ public class BasicUpdateProductService {
udiInfoEntity.setUuid(CustomUtil.getUUId()); udiInfoEntity.setUuid(CustomUtil.getUUId());
udiInfoEntity.setProductType(ConstantStatus.PRODUCT_TYPE_THIRD); udiInfoEntity.setProductType(ConstantStatus.PRODUCT_TYPE_THIRD);
udiInfoEntity.setDiType(1); udiInfoEntity.setDiType(1);
udiInfoService.insertUdiInfo(udiInfoEntity); UdiInfoRequest udiInfoRequest=new UdiInfoRequest();
BeanUtils.copyProperties(udiInfoEntity, udiInfoRequest);
udiInfoService.insertUdiInfo(udiInfoRequest);
} }
udiRelevanceEntity1.setUuid(udiInfoEntity.getUuid()); udiRelevanceEntity1.setUuid(udiInfoEntity.getUuid());
udiRelevanceEntity1.setThirdName(thrProductsEntity.getName()); udiRelevanceEntity1.setThirdName(thrProductsEntity.getName());

@ -1,16 +1,15 @@
package com.glxp.sale.admin.thread; package com.glxp.sale.admin.thread;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.glxp.sale.admin.entity.basic.UdiInfoEntity;
import com.glxp.sale.admin.entity.basic.UdiRelevanceEntity; import com.glxp.sale.admin.entity.basic.UdiRelevanceEntity;
import com.glxp.sale.admin.entity.info.CompanyProductRelevanceEntity; import com.glxp.sale.admin.entity.info.CompanyProductRelevanceEntity;
import com.glxp.sale.admin.req.basic.SupplementRequest; import com.glxp.sale.admin.req.basic.SupplementRequest;
import com.glxp.sale.admin.req.basic.UdiInfoExportRequest; import com.glxp.sale.admin.req.basic.UdiInfoExportRequest;
import com.glxp.sale.admin.req.basic.UdiInfoRequest;
import com.glxp.sale.admin.service.basic.UdiInfoService; import com.glxp.sale.admin.service.basic.UdiInfoService;
import com.glxp.sale.admin.service.basic.UdiRelevanceService; import com.glxp.sale.admin.service.basic.UdiRelevanceService;
import com.glxp.sale.admin.service.info.CompanyProductRelevanceService; import com.glxp.sale.admin.service.info.CompanyProductRelevanceService;
import com.glxp.sale.admin.util.BeanUtils; import com.glxp.sale.admin.util.BeanUtils;
import org.springframework.context.annotation.Bean;
import org.springframework.scheduling.annotation.Async; import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@ -40,13 +39,13 @@ public class CompanyProductsRelService {
if (udiRelevanceEntity != null && StrUtil.isNotBlank(udiRelevanceEntity.getPrice())) { if (udiRelevanceEntity != null && StrUtil.isNotBlank(udiRelevanceEntity.getPrice())) {
companyProductRelevanceEntity.setPrice(new BigDecimal(udiRelevanceEntity.getPrice())); companyProductRelevanceEntity.setPrice(new BigDecimal(udiRelevanceEntity.getPrice()));
} }
UdiInfoEntity udiInfoEntity = new UdiInfoEntity(); UdiInfoRequest udiInfoRequest = new UdiInfoRequest();
udiInfoEntity.setUuid(udiRelevanceEntity.getUuid()); udiInfoRequest.setUuid(udiRelevanceEntity.getUuid());
SupplementRequest supplementRequest = udiInfoExportRequest.getSupplementRequest(); SupplementRequest supplementRequest = udiInfoExportRequest.getSupplementRequest();
BeanUtils.copyProperties(udiInfoExportRequest.getSupplementRequest(), udiInfoEntity); BeanUtils.copyProperties(udiInfoExportRequest.getSupplementRequest(), udiInfoRequest);
BeanUtils.copyProperties(supplementRequest, udiRelevanceEntity); BeanUtils.copyProperties(supplementRequest, udiRelevanceEntity);
udiRelevanceService.updateUdiRelevance(udiRelevanceEntity); udiRelevanceService.updateUdiRelevance(udiRelevanceEntity);
udiInfoService.updateUdiInfo(udiInfoEntity); udiInfoService.updateUdiInfo(udiInfoRequest);
companyProductRelevanceEntity.setCreate_time(new Date()); companyProductRelevanceEntity.setCreate_time(new Date());
companyProductRelevanceEntity.setUpdate_time(new Date()); companyProductRelevanceEntity.setUpdate_time(new Date());
companyProductRelevanceEntity.setAuditStatus("3"); companyProductRelevanceEntity.setAuditStatus("3");

@ -1,9 +1,9 @@
# \u751F\u4EA7\u73AF\u5883 # \u751F\u4EA7\u73AF\u5883
server.port=9996 server.port=9987
spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
spring.datasource.jdbc-url=jdbc:mysql://127.0.0.1:3306/spms_za?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true spring.datasource.jdbc-url=jdbc:mysql://192.168.0.62:3306/spms?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
spring.datasource.username=root spring.datasource.username=root
spring.datasource.password=123456 spring.datasource.password=Glxp@6066
spring.datasource.hikari.connection-timeout=60000 spring.datasource.hikari.connection-timeout=60000
spring.datasource.hikari.maximum-pool-size=60 spring.datasource.hikari.maximum-pool-size=60
spring.datasource.hikari.minimum-idle=10 spring.datasource.hikari.minimum-idle=10

@ -1,4 +1,4 @@
spring.profiles.active=dev spring.profiles.active=pro
spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver

@ -32,6 +32,12 @@
<if test="action != ''and action != null"> <if test="action != ''and action != null">
AND basic_bustype_pre.`action` = #{action} AND basic_bustype_pre.`action` = #{action}
</if> </if>
<if test="originName != ''and originName != null">
AND busTypeA.NAME LIKE CONCAT(#{originName},'%')
</if>
<if test="targetName != ''and targetName != null">
AND busTypeB.name LIKE CONCAT(#{targetName},'%')
</if>
<if test="originAction != ''and originAction != null"> <if test="originAction != ''and originAction != null">
AND basic_bustype_pre.`originAction` = #{originAction} AND basic_bustype_pre.`originAction` = #{originAction}
</if> </if>

@ -127,7 +127,7 @@
nameCode = #{nameCode}) limit 1 nameCode = #{nameCode}) limit 1
</select> </select>
<insert id="insertUdiInfo" keyProperty="id" parameterType="com.glxp.sale.admin.entity.basic.UdiInfoEntity"> <insert id="insertUdiInfo" keyProperty="id" parameterType="com.glxp.sale.admin.req.basic.UdiInfoRequest">
replace replace
INTO basic_products INTO basic_products
(id, (id,
@ -232,7 +232,7 @@
WHERE uuid = #{uuid} WHERE uuid = #{uuid}
</delete> </delete>
<update id="updateUdiInfo" parameterType="com.glxp.sale.admin.entity.basic.UdiInfoEntity"> <update id="updateUdiInfo" parameterType="com.glxp.sale.admin.req.basic.UdiInfoRequest">
UPDATE basic_products UPDATE basic_products
<trim prefix="set" suffixOverrides=","> <trim prefix="set" suffixOverrides=",">
<if test="packRatio != null">packRatio=#{packRatio},</if> <if test="packRatio != null">packRatio=#{packRatio},</if>

@ -221,7 +221,8 @@
</if> </if>
</where> </where>
group by stock_order.id group by stock_order.id
ORDER BY updateTime DESC ORDER BY stock_order.billdate DESC
</select> </select>

@ -44,9 +44,15 @@
<if test="auditBy != '' and auditBy != null"> <if test="auditBy != '' and auditBy != null">
AND auditBy = #{auditBy} AND auditBy = #{auditBy}
</if> </if>
<if test="generatePlan != null">
AND generatePlan != #{generatePlan}
</if>
<if test="createBy != '' and createBy != null"> <if test="createBy != '' and createBy != null">
AND createBy = #{createBy} AND createBy = #{createBy}
</if> </if>
<if test="applyType != null">
AND generatePlan = 1
</if>
</where> </where>
</select> </select>

@ -78,6 +78,13 @@
where id = #{id} where id = #{id}
</select> </select>
<select id="filterThrProductsGetUuid" parameterType="string"
resultType="com.glxp.sale.admin.entity.thrsys.ThrProductsAddDiEntity">
select *
from thr_products_add_di
where uuid = #{uuid}
</select>
<select id="filterThrProductsList" parameterType="com.glxp.sale.admin.req.thrsys.FilterThrProductsRequest" <select id="filterThrProductsList" parameterType="com.glxp.sale.admin.req.thrsys.FilterThrProductsRequest"
resultType="com.glxp.sale.admin.res.thrsys.ThrProductsAddDiResponse"> resultType="com.glxp.sale.admin.res.thrsys.ThrProductsAddDiResponse">

Loading…
Cancel
Save