UDI
/
spms-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

条码缺失修改

Browse Source
busUser
anthonywj 2 years ago
parent 80cf615370
commit 7b97cd8a50
10 changed files with 80 additions and 24 deletions
Show Stats Download Patch File Download Diff File

8
api-admin/src/main/java/com/glxp/sale/admin/controller/basic/SpsSyncDownloadService.java
Unescape Escape View File

@ -36,6 +36,7 @@ import com.glxp.sale.admin.res.basic.SpSyncUdiResponse;
import com.glxp.sale.admin.res.basic.SpsSyncBusResponse;
import com.glxp.sale.admin.res.basic.SpsSyncDataResponse;
import com.glxp.sale.admin.res.basic.SpsSyncOrderResponse;
import com.glxp.sale.admin.res.inout.IoCodeLostResponse;
import com.glxp.sale.admin.res.param.SyncDataSetResponse;
import com.glxp.sale.admin.service.auth.AuthAdminService;
import com.glxp.sale.admin.service.auth.DeptService;
@ -350,10 +351,15 @@ public class SpsSyncDownloadService {
}
syncDataResponse.setSupCertEntities(supCertEntityList);
IoCodeLostEntity ioCodeLostEntity = new IoCodeLostEntity();
ioCodeLostEntity.setLastUpdateTime(spsSyncDataRequest.getLastUpdateTime());
List<IoCodeLostEntity> ioCodeLostEntities = ioCodeLostService.filterList(ioCodeLostEntity);
syncDataResponse.setIoCodeLostEntities(ioCodeLostEntities);
return ResultVOUtils.success(syncDataResponse);
}
@Resource
IoCodeLostService ioCodeLostService;
//单据类型
@Resource
BussinessTypeService bussinessTypeService;

29
api-admin/src/main/java/com/glxp/sale/admin/controller/inout/WareHouseController.java
Unescape Escape View File

@ -595,6 +595,8 @@ public class WareHouseController {
@Resource
InvProductDetailService invProductDetailService;
@Resource
IoCodeLostService codeLostService;
//网页端数据上传调用接口
@AuthRuleAnnotation("")
@ -652,16 +654,25 @@ public class WareHouseController {
BaseResponse checkOriginCodeRes = checkOriginCode(udiEntity);
if (checkOriginCodeRes != null) {
if (StrUtil.isNotEmpty(orderId)) {
WarehouseQueryRequest warehouseQueryRequest = new WarehouseQueryRequest();
warehouseQueryRequest.setOrderId(orderId);
List<WarehouseEntity> warehouseEntitys = codesTempService.findByOrderIdAndCode(warehouseQueryRequest);
WarehouseEntity warehouseEntity = isExitLocal(code, warehouseEntitys);
if (warehouseEntity == null) {
IoCodeLostEntity codeLostEntity = codeLostService.findByCode(code);
if (codeLostEntity == null) {
if (StrUtil.isNotEmpty(orderId)) {
WarehouseQueryRequest warehouseQueryRequest = new WarehouseQueryRequest();
warehouseQueryRequest.setOrderId(orderId);
List<WarehouseEntity> warehouseEntitys = codesTempService.findByOrderIdAndCode(warehouseQueryRequest);
WarehouseEntity warehouseEntity = isExitLocal(code, warehouseEntitys);
if (warehouseEntity == null) {
return checkOriginCodeRes;
}
} else
return checkOriginCodeRes;
}
} else
return checkOriginCodeRes;
} else {
udiEntity.setBatchNo(codeLostEntity.getBatchNo());
udiEntity.setExpireDate(codeLostEntity.getExpireDate());
udiEntity.setProduceDate(codeLostEntity.getProduceDate());
}
}
}

4
api-admin/src/main/java/com/glxp/sale/admin/dao/inout/IoCodeLostMapper.java
Unescape Escape View File

@ -10,5 +10,9 @@ import java.util.List;
@Mapper
public interface IoCodeLostMapper extends BaseMapperPlus<IoCodeLostMapper, IoCodeLostEntity, IoCodeLostEntity> {
List<IoCodeLostResponse> selectLost(IoCodeLostEntity ioCodeLostEntity);
List<IoCodeLostEntity> filterList(IoCodeLostEntity ioCodeLostEntity);
}

4
api-admin/src/main/java/com/glxp/sale/admin/entity/inout/IoCodeLostEntity.java
Unescape Escape View File

@ -86,8 +86,8 @@ public class IoCodeLostEntity {
@TableField(exist = false)
private String endTime;
@TableField(exist = false)
private String lastUpdateTime;
public static final String COL_ID = "id";

3
api-admin/src/main/java/com/glxp/sale/admin/res/basic/SpsSyncDataResponse.java
Unescape Escape View File

@ -7,6 +7,7 @@ import com.glxp.sale.admin.entity.basic.NewUploadDiEntity;
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.inout.IoCodeLostEntity;
import com.glxp.sale.admin.entity.inout.WarehouseBussinessTypeEntity;
import com.glxp.sale.admin.entity.inout.WarehouseUserEntity;
import com.glxp.sale.admin.entity.inventory.InvBusUserEntity;
@ -64,4 +65,6 @@ public class SpsSyncDataResponse {
List<SupCertEntity> supCertEntities;
List<IoCodeLostEntity> ioCodeLostEntities;
}

1
api-admin/src/main/java/com/glxp/sale/admin/service/inout/IoCodeLostService.java
Unescape Escape View File

@ -10,6 +10,7 @@ public interface IoCodeLostService {
List<IoCodeLostResponse> selectLost(IoCodeLostEntity ioCodeLostEntity);
List<IoCodeLostEntity> filterList(IoCodeLostEntity ioCodeLostEntity);
IoCodeLostEntity findByCode(String code);

5
api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/IoCodeLostServiceImpl.java
Unescape Escape View File

@ -22,6 +22,11 @@ public class IoCodeLostServiceImpl implements IoCodeLostService {
return codeLostEntityMapper.selectLost(ioCodeLostEntity);
}
@Override
public List<IoCodeLostEntity> filterList(IoCodeLostEntity ioCodeLostEntity) {
return codeLostEntityMapper.filterList(ioCodeLostEntity);
}
@Override
public IoCodeLostEntity findByCode(String code) {

1
api-admin/src/main/java/com/glxp/sale/admin/thread/BasicBackUpdateProductService.java
Unescape Escape View File

@ -291,7 +291,6 @@ public class BasicBackUpdateProductService {
//自动创建要求被下载单据类型任务
BasicExportStatusEntity basicExportStatusEntity2 = basicExportService.findByData(ConstantStatus.SYNC_BUS_TYPE, 0);
if (basicExportStatusEntity2 == null) {
BaseResponse<SpsSyncBusResponse> baseResponse = spsSyncDownloadService.findBusType(getRequest(ConstantStatus.SYNC_BUS_TYPE));
SpsSyncBusResponse spsSyncBusResponse = baseResponse.getData();
if (CollUtil.isNotEmpty(spsSyncBusResponse.getBussinessLocalTypeEntities())

11
api-admin/src/main/java/com/glxp/sale/admin/thread/IoTransInoutService.java
Unescape Escape View File

@ -1061,8 +1061,13 @@ public class IoTransInoutService {
for (WarehouseEntity codeEntity : ioCodeEntities) {
UdiEntity udiEntity = FilterUdiUtils.getUdi(codeEntity.getCode());
IoCodeLostEntity codeLostEntity = codeLostService.findByCode(codeEntity.getCode());
if (codeLostEntity == null)
if (codeLostEntity == null) {
codeLostEntity = new IoCodeLostEntity();
codeLostEntity.setCode(codeEntity.getCode());
codeLostEntity.setNameCode(codeEntity.getNameCode());
codeLostEntity.setCreateTime(new Date());
codeLostEntity.setSupId(codeEntity.getSupId());
}
//校验是否写入缺失表
boolean isTrue = false;
@ -1085,8 +1090,10 @@ public class IoTransInoutService {
isTrue = true;
}
}
if (isTrue)
if (isTrue) {
codeLostEntity.setUpdateTime(new Date());
codeLostService.insertOrUpdate(codeLostEntity);
}
}
}

38
api-admin/src/main/resources/mybatis/mapper/inout/IoCodeLostMapper.xml
Unescape Escape View File

@ -1,29 +1,49 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.glxp.sale.admin.dao.inout.IoCodeLostMapper">
<select id="selectLost" parameterType="com.glxp.sale.admin.entity.inout.IoCodeLostEntity"
<select id="selectLost" parameterType="com.glxp.sale.admin.entity.inout.IoCodeLostEntity"
resultType="com.glxp.sale.admin.res.inout.IoCodeLostResponse">
select io_code_lost.*,basic_products.cpmctymc ,basic_products.ggxh from io_code_lost
LEFT JOIN basic_products on io_code_lost.nameCode=basic_products.nameCode
select io_code_lost.*, basic_products.cpmctymc, basic_products.ggxh
from io_code_lost
LEFT JOIN basic_products on io_code_lost.nameCode = basic_products.nameCode
<where>
<if test="code != '' and code != null">
and code like concat('%',#{code},'%')
and code like concat('%', #{code}, '%')
</if>
<if test="cpmctymc != '' and cpmctymc != null">
and basic_products.cpmctymc like concat('%',#{cpmctymc},'%')
and basic_products.cpmctymc like concat('%', #{cpmctymc}, '%')
</if>
<if test="ggxh != '' and ggxh != null">
and basic_products.ggxh like concat('%',#{ggxh},'%')
and basic_products.ggxh like concat('%', #{ggxh}, '%')
</if>
<if test="batchNo != '' and batchNo != null">
and batchNo like concat('%',#{batchNo},'%')
<if test="batchNo != '' and batchNo != null">
and batchNo like concat('%', #{batchNo}, '%')
</if>
<if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
AND date_format(io_code_lost.createTime, '%Y-%m-%d') between date_format(#{startTime}, '%Y-%m-%d') and date_format(#{endTime}, '%Y-%m-%d')
</if>
<if test="lastUpdateTime != null and lastUpdateTime != ''">
<![CDATA[
and DATE_FORMAT(updateTime, '%Y-%m-%d %H:%i:%S') >= DATE_FORMAT(#{lastUpdateTime}, '%Y-%m-%d %H:%i:%S')
]]>
</if>
</where>
</select>
<select id="filterList" parameterType="com.glxp.sale.admin.entity.inout.IoCodeLostEntity"
resultType="com.glxp.sale.admin.entity.inout.IoCodeLostEntity">
select io_code_lost.*
from io_code_lost
<where>
<if test="lastUpdateTime != null and lastUpdateTime != ''">
<![CDATA[
and DATE_FORMAT(updateTime
, '%Y-%m-%d %H:%i:%S') >= DATE_FORMAT(#{lastUpdateTime}
, '%Y-%m-%d %H:%i:%S')
]]>
</if>
</where>
</select>
</mapper>

Write Preview
Loading…
Cancel
Save