业务单据与本地单据优化

master
anthonywj 4 years ago
parent e9e7ab8235
commit a9cf69056b

@ -44,4 +44,8 @@ public class ConstantStatus {
public static int ORDER_DETAIL_DI_MUTI = 1;
public static int ORDER_DETAIL_DI_ONE = 0;
//UDI产品信息表字段类型
public static final Integer PRODUCT_TYPE_UDI = 0;
public static final Integer PRODUCT_TYPE_THIRD = 1;
}

@ -157,7 +157,7 @@ public class UdiInfoImportLogController {
if ((row.getCell(0) == null || row.getCell(1) == null || row.getCell(2) == null
|| row.getCell(3) == null || row.getCell(4) == null || row.getCell(5) == null|| row.getCell(6) == null) ||
(!"udiCode".equals(row.getCell(0).getStringCellValue())
|| !"医保码".equals(row.getCell(1).getStringCellValue())
|| !"医保码".equals(row.getCell(1).getStringCellValue())
|| !"商品条码".equals(row.getCell(2).getStringCellValue())
|| !"thirdId".equals(row.getCell(3).getStringCellValue())
|| !"thirdId1".equals(row.getCell(4).getStringCellValue())

@ -8,6 +8,7 @@ import com.glxp.sale.admin.constant.IncodeStatus;
import com.glxp.sale.admin.controller.inout.inventory.InvPrintController;
import com.glxp.sale.admin.controller.inout.utils.ContrastErpUtil;
import com.glxp.sale.admin.controller.inout.utils.InoutUtils;
import com.glxp.sale.admin.entity.basic.StockPrinttREntity;
import com.glxp.sale.admin.entity.basic.UdiInfoEntity;
import com.glxp.sale.admin.entity.basic.StockPrintEntity;
import com.glxp.sale.admin.entity.info.CompanyEntity;
@ -372,19 +373,28 @@ public class StockOrderController {
if (stockOrderIdsRequest.isFilterUDIType()) {
UdiInfoEntity udiInfoEntity =
udiInfoService.findByNameCode(stockOrderDetailEntity.getProductId());
if (udiInfoEntity != null) {//TODO udi过滤检测
if (udiInfoEntity.getProductType() == ConstantStatus.PRODUCT_TYPE_THIRD) {//TODO udi过滤检测
StockPrintEntity stockPrintEntity = new StockPrintEntity();
BeanUtils.copyProperties(udiInfoEntity, stockPrintEntity);
stockPrintEntity.setSOrderId(stockOrderEntity.getId());
stockPrintEntity.setUpdateTime(new Date());
stockPrintEntity.setNameCode(stockOrderDetailEntity.getProductId());
stockPrintEntity.setProduceDate(stockOrderDetailEntity.getProductDate());
stockPrintEntity.setExpireDate(stockOrderDetailEntity.getExpireDate());
stockPrintEntity.setBatchNo(stockOrderDetailEntity.getBatchNo());
stockPrintEntity.setSDetailId(stockOrderDetailEntity.getId());
stockPrintEntities.add(stockPrintEntity);
}
}else {
StockPrintEntity stockPrintEntity = new StockPrintEntity();
stockPrintEntity.setNameCode(stockOrderDetailEntity.getProductId());
stockPrintEntity.setSOrderId(stockOrderEntity.getId());
stockPrintEntity.setUpdateTime(new Date());
stockPrintEntity.setProduceDate(stockOrderDetailEntity.getProductDate());
stockPrintEntity.setExpireDate(stockOrderDetailEntity.getExpireDate());
stockPrintEntity.setBatchNo(stockOrderDetailEntity.getBatchNo());
stockPrintEntity.setSDetailId(stockOrderDetailEntity.getId());
stockPrintEntities.add(stockPrintEntity);
}
}
PostStockPrintRequest postStockPrintRequest = new PostStockPrintRequest();
@ -418,9 +428,12 @@ public class StockOrderController {
List<StockPrintEntity> stockPrintEntities = postStockPrintRequest.getDatas();
if (stockPrintEntities != null && stockPrintEntities.size() > 0) {
for (StockPrintEntity stockPrintEntity : stockPrintEntities) {
StockPrinttREntity stockPrinttREntity = new StockPrinttREntity();
BeanUtils.copyProperties(stockPrintEntity,stockPrinttREntity);
stockPrintEntity.setGenKeyFk(genKey);
String udiCode = "#" + stockPrintEntity.getNameCode() + "#" + stockPrintEntity.getProduceDate() + "#" + stockPrintEntity.getExpireDate() +
"#" + stockPrintEntity.getBatchNo() + "#" + stockPrintEntity.getSerialNo() + "#" + stockPrintEntity.getWarehouseCode() + "#" + stockPrintEntity.getSpaceCode();
String udiCode = "#" + stockPrinttREntity.getNameCode() + "#" + stockPrinttREntity.getProduceDate() + "#" + stockPrinttREntity.getExpireDate() +
"#" + stockPrinttREntity.getBatchNo() + "#" + stockPrinttREntity.getSerialNo() + "#" + stockPrinttREntity.getWarehouseCode() + "#" + stockPrinttREntity.getSpaceCode();
stockPrintEntity.setUdiCode(udiCode);
stockPrintService.insertStockPrint(stockPrintEntity);

@ -8,6 +8,8 @@ public class BussinessLocalTypeEntity {
private Integer id;
private String action;
private String name;
private String localAction;
private String localName;
private String remark;
private Boolean enable;

@ -12,5 +12,6 @@ public class BussinessTypeEntity {
private String mainAction;
private String thirdSysFk;
private String localAction;
private String localName;
}

@ -0,0 +1,262 @@
package com.glxp.sale.admin.entity.basic;
import java.util.Date;
public class StockPrinttREntity {
private int id;
private String udiRlIdFk;
private String udiCode;
private String nameCode;
private String cpmctymc;
private String batchNo;
private String produceDate;
private String expireDate;
private String serialNo;
private String codeType;
private String thirdId;
private String thirdName;
private String printStatus;
private String ggxh;
private String ylqxzcrbarmc;
private String zczbhhzbapzbh;
private String warehouseName;
private String warehouseCode;
private String spaceCode;
private String spaceName;
private String thirdSysFk;
private String nnum;
private String genKeyFk;
private String sOrderId;
private String sDetailId;
private Date updateTime;
public int getId() {
return id;
}
public void setId(int id) {
this.id = id;
}
public String getUdiRlIdFk() {
return udiRlIdFk;
}
public void setUdiRlIdFk(String udiRlIdFk) {
this.udiRlIdFk = udiRlIdFk;
}
public String getUdiCode() {
return udiCode;
}
public void setUdiCode(String udiCode) {
this.udiCode = udiCode;
}
public String getNameCode() {
return nameCode;
}
public void setNameCode(String nameCode) {
this.nameCode = nameCode;
}
public String getCpmctymc() {
return cpmctymc;
}
public void setCpmctymc(String cpmctymc) {
this.cpmctymc = cpmctymc;
}
public String getBatchNo() {
if(batchNo==null){
return "";
}
return batchNo;
}
public void setBatchNo(String batchNo) {
this.batchNo = batchNo;
}
public String getProduceDate() {
if(produceDate==null){
return "";
}
return produceDate;
}
public void setProduceDate(String produceDate) {
this.produceDate = produceDate;
}
public String getExpireDate() {
if(expireDate==null){
return "";
}
return expireDate;
}
public void setExpireDate(String expireDate) {
this.expireDate = expireDate;
}
public String getSerialNo() {
if(serialNo==null){
return "";
}
return serialNo;
}
public void setSerialNo(String serialNo) {
this.serialNo = serialNo;
}
public String getCodeType() {
return codeType;
}
public void setCodeType(String codeType) {
this.codeType = codeType;
}
public String getThirdId() {
return thirdId;
}
public void setThirdId(String thirdId) {
this.thirdId = thirdId;
}
public String getThirdName() {
return thirdName;
}
public void setThirdName(String thirdName) {
this.thirdName = thirdName;
}
public String getPrintStatus() {
return printStatus;
}
public void setPrintStatus(String printStatus) {
this.printStatus = printStatus;
}
public String getGgxh() {
return ggxh;
}
public void setGgxh(String ggxh) {
this.ggxh = ggxh;
}
public String getYlqxzcrbarmc() {
return ylqxzcrbarmc;
}
public void setYlqxzcrbarmc(String ylqxzcrbarmc) {
this.ylqxzcrbarmc = ylqxzcrbarmc;
}
public String getZczbhhzbapzbh() {
return zczbhhzbapzbh;
}
public void setZczbhhzbapzbh(String zczbhhzbapzbh) {
this.zczbhhzbapzbh = zczbhhzbapzbh;
}
public String getWarehouseName() {
return warehouseName;
}
public void setWarehouseName(String warehouseName) {
this.warehouseName = warehouseName;
}
public String getWarehouseCode() {
if(warehouseCode==null){
return "";
}
return warehouseCode;
}
public void setWarehouseCode(String warehouseCode) {
this.warehouseCode = warehouseCode;
}
public String getSpaceCode() {
if(spaceCode==null){
return "";
}
return spaceCode;
}
public void setSpaceCode(String spaceCode) {
this.spaceCode = spaceCode;
}
public String getSpaceName() {
return spaceName;
}
public void setSpaceName(String spaceName) {
this.spaceName = spaceName;
}
public String getThirdSysFk() {
return thirdSysFk;
}
public void setThirdSysFk(String thirdSysFk) {
this.thirdSysFk = thirdSysFk;
}
public String getNnum() {
return nnum;
}
public void setNnum(String nnum) {
this.nnum = nnum;
}
public String getGenKeyFk() {
return genKeyFk;
}
public void setGenKeyFk(String genKeyFk) {
this.genKeyFk = genKeyFk;
}
public String getsOrderId() {
return sOrderId;
}
public void setsOrderId(String sOrderId) {
this.sOrderId = sOrderId;
}
public String getsDetailId() {
return sDetailId;
}
public void setsDetailId(String sDetailId) {
this.sDetailId = sDetailId;
}
public Date getUpdateTime() {
return updateTime;
}
public void setUpdateTime(Date updateTime) {
this.updateTime = updateTime;
}
}

@ -34,6 +34,7 @@ public class UdiInfoEntity {
private String sptm;
private String manufactory;
private String measname;
private Integer productType;
//本地生成信息
@ -98,6 +99,7 @@ public class UdiInfoEntity {
}
return bhzxxsbzsl;
}
public String getSptm() {
return sptm;
}
@ -347,7 +349,7 @@ public class UdiInfoEntity {
}
public Integer getCount() {
if(count ==null)
if (count == null)
return 1;
return count;
}
@ -379,4 +381,12 @@ public class UdiInfoEntity {
public void setCheck(Boolean check) {
isCheck = check;
}
public Integer getProductType() {
return productType;
}
public void setProductType(Integer productType) {
this.productType = productType;
}
}

@ -7,7 +7,7 @@ import lombok.Data;
public class FilterUdiEpLogRequest extends ListPageRequest {
private Integer type;
private String genKey;
private Integer status;
}

@ -11,4 +11,5 @@ public class FilterUdiIpLogRequest extends ListPageRequest {
private String genKey;
private Integer status;
private String thirdSysFk;
private String fromType;
}

@ -1,5 +1,6 @@
package com.glxp.sale.admin.thread;
import com.glxp.sale.admin.constant.ConstantStatus;
import com.glxp.sale.admin.entity.basic.UdiInfoEntity;
import com.glxp.sale.admin.entity.basic.UdiRelevanceEntity;
import com.glxp.sale.admin.entity.param.SystemParamConfigEntity;
@ -81,7 +82,7 @@ public class BasicBackUpdateProductService {
udiInfoEntity.setGgxh(invmandocResponse.getSpec());
udiInfoEntity.setUuid(CustomUtil.getUUId());
udiInfoEntity.setDiType(1);
udiInfoEntity.setProductType(ConstantStatus.PRODUCT_TYPE_THIRD);
udiInfoEntity.setManufactory(invmandocResponses.get(0).getManufactory());
udiInfoEntity.setYlqxzcrbarmc(invmandocResponses.get(0).getManufactory());
udiInfoEntity.setZczbhhzbapzbh(invmandocResponses.get(0).getRegisterNo());
@ -157,6 +158,7 @@ public class BasicBackUpdateProductService {
udiInfoEntity.setCpmctymc(thrProductsEntity.getName());
udiInfoEntity.setGgxh(thrProductsEntity.getSpec());
udiInfoEntity.setUuid(CustomUtil.getUUId());
udiInfoEntity.setProductType(ConstantStatus.PRODUCT_TYPE_THIRD);
udiInfoEntity.setDiType(1);
udiInfoEntity.setManufactory(thrProductsEntity.getManufactory());
udiInfoEntity.setYlqxzcrbarmc(thrProductsEntity.getManufactory());

@ -256,7 +256,7 @@ public class BasicGenExcelService {
rows.add(udiRelevanceResponse.getNameCode());
rows.add(udiRelevanceResponse.getYbbm());
rows.add(udiRelevanceResponse.getSptm());
rows.add(udiRelevanceResponse.getErpId());
rows.add(udiRelevanceResponse.getThirdId());
rows.add(udiRelevanceResponse.getThirdId1());
rows.add(udiRelevanceResponse.getThirdId2());
rows.add(udiRelevanceResponse.getThirdId3());

@ -3,6 +3,7 @@ package com.glxp.sale.admin.thread;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.TypeReference;
import com.glxp.sale.admin.constant.BasicProcessStatus;
import com.glxp.sale.admin.constant.ConstantStatus;
import com.glxp.sale.admin.entity.basic.*;
import com.glxp.sale.admin.entity.param.SystemParamConfigEntity;
import com.glxp.sale.admin.entity.thrsys.ThrProductsEntity;
@ -104,6 +105,7 @@ public class BasicUdiInfoImportService {
udiInfoEntity.setCpmctymc(thrProductsEntity.getName());
udiInfoEntity.setGgxh(thrProductsEntity.getSpec());
udiInfoEntity.setUuid(CustomUtil.getUUId());
udiInfoEntity.setProductType(ConstantStatus.PRODUCT_TYPE_THIRD);
udiInfoEntity.setDiType(1);
udiInfoEntity.setManufactory(thrProductsEntity.getManufactory());
udiInfoEntity.setYlqxzcrbarmc(thrProductsEntity.getManufactory());

@ -2,6 +2,7 @@ package com.glxp.sale.admin.thread;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.TypeReference;
import com.glxp.sale.admin.constant.ConstantStatus;
import com.glxp.sale.admin.entity.basic.BasicThirdSysDetailEntity;
import com.glxp.sale.admin.entity.basic.UdiInfoEntity;
import com.glxp.sale.admin.entity.basic.UdiRelevanceEntity;
@ -83,6 +84,7 @@ public class BasicUpdateProductService {
udiInfoEntity.setGgxh(erpProductsResponse.getSpec());
udiInfoEntity.setZczbhhzbapzbh(erpProductsResponse.getRegisterNo());
udiInfoEntity.setUuid(CustomUtil.getUUId());
udiInfoEntity.setProductType(ConstantStatus.PRODUCT_TYPE_THIRD);
udiInfoEntity.setDiType(1);
udiInfoService.insertUdiInfo(udiInfoEntity);
udiRelevanceEntity1.setUuid(udiInfoEntity.getUuid());
@ -124,6 +126,7 @@ public class BasicUpdateProductService {
udiInfoEntity.setGgxh(thrProductsEntity.getSpec());
udiInfoEntity.setZczbhhzbapzbh(thrProductsEntity.getRegisterNo());
udiInfoEntity.setUuid(CustomUtil.getUUId());
udiInfoEntity.setProductType(ConstantStatus.PRODUCT_TYPE_THIRD);
udiInfoEntity.setDiType(1);
udiInfoService.insertUdiInfo(udiInfoEntity);
udiRelevanceEntity1.setUuid(udiInfoEntity.getUuid());

@ -4,8 +4,8 @@ server.port=9996
spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
spring.datasource.jdbc-url=jdbc:mysql://127.0.0.1:3306/spms?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
spring.datasource.username=root
spring.datasource.password=root
#spring.datasource.password=123456
#spring.datasource.password=root
spring.datasource.password=123456
server.servlet.context-path=
logging.level.com.glxp.sale.admin.dao=debug
# \u8DE8\u57DF\u8BBE\u7F6E

@ -24,7 +24,9 @@
<select id="filterJoin" parameterType="com.glxp.sale.admin.req.basic.BussinessLocalTypeFilterRequest"
resultType="com.glxp.sale.admin.entity.basic.BussinessLocalTypeEntity">
SELECT basic_bustype_local.name, basic_bussiness_type.action FROM basic_bustype_local inner join
SELECT basic_bustype_local.name localName, basic_bustype_local.action localAction,
basic_bussiness_type.name , basic_bussiness_type.action
FROM basic_bustype_local inner join
basic_bussiness_type
on basic_bustype_local.action = basic_bussiness_type.localAction
<where>

@ -5,19 +5,25 @@
<select id="filterList" parameterType="com.glxp.sale.admin.req.basic.BussinessTypeFilterRequest"
resultType="com.glxp.sale.admin.entity.basic.BussinessTypeEntity">
SELECT * FROM basic_bussiness_type
SELECT
basic_bussiness_type.id,basic_bussiness_type.action,basic_bussiness_type.name,
basic_bussiness_type.enable,basic_bussiness_type.remark,basic_bussiness_type.mainAction,
basic_bussiness_type.thirdSysFk,basic_bussiness_type.localAction,
basic_bustype_local.name localName
FROM basic_bussiness_type LEFT JOIN basic_bustype_local
on basic_bussiness_type.localAction = basic_bustype_local.name
<where>
<if test="name != ''and name != null">
AND name LIKE concat(#{name},'%')
AND basic_bussiness_type.name LIKE concat(#{name},'%')
</if>
<if test="action != ''and action != null">
AND action LIKE concat(#{action},'%')
AND basic_bussiness_type.action LIKE concat(#{action},'%')
</if>
<if test="mainAction != ''and mainAction != null">
AND action LIKE concat(#{mainAction},'%')
AND basic_bussiness_type.mainAction LIKE concat(#{mainAction},'%')
</if>
<if test="enabled != ''and enabled != null">
AND enable =#{enabled}
AND basic_bussiness_type.enable =#{enabled}
</if>
</where>

@ -110,7 +110,7 @@
nameCode,packRatio,packLevel,bhxjsl,
bhzxxsbzsl,zxxsbzbhsydysl,bhxjcpbm,bzcj,addType,deviceRecordKey,
cpmctymc,cplb,flbm,ggxh,qxlb,tyshxydm,ylqxzcrbarmc,zczbhhzbapzbh,ylqxzcrbarywmc,uuid,sjcpbm,versionNumber
,diType
,diType,productType
)
values
(
@ -136,7 +136,7 @@
#{uuid},
#{sjcpbm},
#{versionNumber},
#{diType}
#{diType},#{productType}
)
</insert>
@ -146,7 +146,7 @@
nameCode,packRatio,packLevel,bhxjsl,
bhzxxsbzsl,zxxsbzbhsydysl,bhxjcpbm,bzcj,addType,deviceRecordKey,
cpmctymc,cplb,flbm,ggxh,qxlb,tyshxydm,ylqxzcrbarmc,zczbhhzbapzbh,ylqxzcrbarywmc,uuid,sjcpbm,versionNumber
,diType
,diType,productType
)
values
@ -175,7 +175,7 @@
#{item.uuid},
#{item.sjcpbm},
#{item.versionNumber},
#{item.diType}
#{item.diType},#{item.productType}
)
</foreach>
</insert>
@ -216,6 +216,7 @@
<if test="ybbm != null">ybbm=#{ybbm},</if>
<if test="measname != null">measname=#{measname},</if>
<if test="diType != null">diType=#{diType},</if>
<if test="productType != null">productType=#{productType},</if>
</trim>
WHERE nameCode = #{nameCode}
</update>

Loading…
Cancel
Save