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

流向加单据类型名称，新增产品审核后自动添加到耗材字典

Browse Source
fencang
anthonyywj2 3 years ago
parent 7a2c66b110
commit 9b5509450e
4 changed files with 79 additions and 8 deletions
Show Stats Download Patch File Download Diff File

7
api-admin/src/main/java/com/glxp/sale/admin/controller/thrsys/ThrProductsAddController.java
Unescape Escape View File

@ -9,6 +9,7 @@ import com.glxp.sale.admin.req.info.DeleteRequest;
import com.glxp.sale.admin.req.thrsys.FilterThrProductsRequest;
import com.glxp.sale.admin.res.PageSimpleResponse;
import com.glxp.sale.admin.service.auth.CustomerService;
import com.glxp.sale.admin.service.basic.UdiContrastService;
import com.glxp.sale.admin.service.thrsys.ThrProductsAddService;
import com.glxp.sale.admin.service.thrsys.ThrProductsService;
import com.glxp.sale.admin.util.BeanUtils;
@ -71,6 +72,10 @@ public class ThrProductsAddController {
return ResultVOUtils.success("删除成功");
}
@Resource
UdiContrastService udiContrastService;
@AuthRuleAnnotation("")
@PostMapping("/udiwms/thrsys/updateThrAddProducts")
public BaseResponse updateThrAddProducts(@RequestBody ThrProductsAddEntity thrProductsAddEntity, BindingResult bindingResult) {
@ -85,6 +90,8 @@ public class ThrProductsAddController {
BeanUtils.copyProperties(thrProductsAddEntity, thrProductsEntity);
thrProductsEntity.setUpdateTime(new Date());
thrProductsService.insertThrProducts(thrProductsEntity);
//审核通过后直接加到耗材字典里
udiContrastService.createOnlyMainId(thrProductsAddEntity.getCode());
} else if (thrProductsAddEntity.getCheckStatus().equals(3)) {
//不通过，删除第三方产品信息表中此产品数据
thrProductsService.delete(thrProductsAddEntity);

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

@ -9,6 +9,7 @@ public class UdiTraceResponse {
private String actDate;
private String mainAction;
private String action;
private String actionName;
private String fromCorp;
private Integer count;
private String cpmctymc;

59
api-admin/src/main/java/com/glxp/sale/admin/service/basic/UdiContrastService.java
Unescape Escape View File

@ -2,9 +2,20 @@ package com.glxp.sale.admin.service.basic;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil;
import com.glxp.sale.admin.constant.ConstantStatus;
import com.glxp.sale.admin.dao.basic.UdiRelevanceDao;
import com.glxp.sale.admin.entity.basic.UdiInfoEntity;
import com.glxp.sale.admin.entity.basic.UdiRelevanceEntity;
import com.glxp.sale.admin.entity.thrsys.ThrProductsEntity;
import com.glxp.sale.admin.req.basic.CombineRequest;
import com.glxp.sale.admin.req.basic.FilterUdiInfoRequest;
import com.glxp.sale.admin.req.thrsys.FilterThrProductsRequest;
import com.glxp.sale.admin.service.thrsys.ThrProductsService;
import com.glxp.sale.admin.util.CustomUtil;
import com.glxp.sale.admin.util.DateUtil;
import com.glxp.sale.admin.util.GennerOrderUtils;
import com.glxp.sale.admin.util.UdiInfoUtil;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
@ -94,5 +105,53 @@ public class UdiContrastService {
return udiRelevanceEntities;
}
@Resource
GennerOrderUtils gennerOrderUtils;
@Resource
ThrProductsService thrProductsService;
@Resource
UdiRelevanceService udiRelevanceService;
@Resource
UdiInfoService udiInfoService;
public void createOnlyMainId(String mainId) {
FilterThrProductsRequest filterThrProductsRequest = new FilterThrProductsRequest();
filterThrProductsRequest.setCode(mainId);
List<ThrProductsEntity> thrProductsEntities = thrProductsService.selectThrProducts(filterThrProductsRequest);
ThrProductsEntity thrProductsEntity = thrProductsEntities.get(0);
UdiRelevanceEntity udiRelevanceEntity = new UdiRelevanceEntity();
udiRelevanceEntity.setThirdId(thrProductsEntity.getCode());
udiRelevanceEntity.setThirdName(thrProductsEntity.getName());
udiRelevanceEntity.setMainId(thrProductsEntity.getCode());
udiRelevanceEntity.setMainName(thrProductsEntity.getName());
udiRelevanceEntity.setMeasname(thrProductsEntity.getMeasname());
String time = DateUtil.getDateTime();
udiRelevanceEntity.setUpdateTime(time);
udiRelevanceEntity.setModifyTime(time);
udiRelevanceEntity.setUuid(CustomUtil.getUUId());
udiRelevanceEntity.setSupName(thrProductsEntity.getSupName());
udiRelevanceEntity.setManufactory(thrProductsEntity.getManufactory());
udiRelevanceEntity.setId(gennerOrderUtils.getRelId() + "");
udiRelevanceEntity.setPrice(thrProductsEntity.getPrice());
udiRelevanceService.insertUdiRelevance(udiRelevanceEntity);
UdiInfoEntity udiInfoEntity = new UdiInfoEntity();
BeanUtils.copyProperties(thrProductsEntity, udiInfoEntity);
udiInfoEntity.setNameCode(thrProductsEntity.getCode());
udiInfoEntity.setCpmctymc(thrProductsEntity.getName());
udiInfoEntity.setManufactory(thrProductsEntity.getManufactory());
udiInfoEntity.setYlqxzcrbarmc(thrProductsEntity.getManufactory());
udiInfoEntity.setGgxh(thrProductsEntity.getSpec());
udiInfoEntity.setZczbhhzbapzbh(thrProductsEntity.getRegisterNo());
udiInfoEntity.setUuid(udiRelevanceEntity.getUuid());
udiInfoEntity.setProductType(ConstantStatus.PRODUCT_TYPE_THIRD);
udiInfoEntity.setDiType(1);
udiInfoEntity.setScbssfbhph("是");
udiInfoEntity.setScbssfbhscrq("是");
udiInfoEntity.setScbssfbhsxrq("是");
udiInfoEntity.setScbssfbhxlh("否");
udiInfoEntity = UdiInfoUtil.initUdiInfoEntity(udiInfoEntity);
udiInfoService.insertUdiInfo(udiInfoEntity);
}
}

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

@ -34,7 +34,7 @@
receiveStatus, erpFk, stockCheckFk, customerId, supId,
exportFilePath, locStorageCode, supplementNo, ullageSupNo, createUser, reviewUser,
outChangeEnable, originUllageSupNo, preCheck, updateTime, replicateNo, invWarehouseCode,
fromSubInvCode, createTime,invStorageCode)
fromSubInvCode, createTime, invStorageCode)
values (#{id},
#{action},
#{corpOrderId},
@ -54,7 +54,7 @@
#{stockCheckFk},
#{customerId}, #{supId}, #{exportFilePath}, #{locStorageCode}, #{supplementNo},
#{ullageSupNo}, #{createUser}, #{reviewUser}, #{outChangeEnable}, #{originUllageSupNo}, #{preCheck},
#{updateTime}, #{replicateNo}, #{invWarehouseCode}, #{fromSubInvCode}, #{createTime},#{invStorageCode})
#{updateTime}, #{replicateNo}, #{invWarehouseCode}, #{fromSubInvCode}, #{createTime}, #{invStorageCode})
</insert>
@ -99,7 +99,8 @@
#{replicateNo},
#{invWarehouseCode},
#{fromSubInvCode},
#{createTime},#{invStorageCode}
#{createTime},
#{invStorageCode}
)
</insert>
@ -191,7 +192,8 @@
</update>
<select id="filterListOr" parameterType="com.glxp.sale.admin.req.inout.OrderFilterRequest"
resultType="com.glxp.sale.admin.entity.inout.OrderEntity">
SELECT io_order.* ,inv_warehouse.name invName, iws.name subInvName ,basic_bussiness_type.name billTypeName FROM io_order
SELECT io_order.* ,inv_warehouse.name invName, iws.name subInvName ,basic_bussiness_type.name billTypeName FROM
io_order
left join basic_bussiness_type on io_order.action = basic_bussiness_type.action
LEFT JOIN inv_warehouse ON io_order.locStorageCode = inv_warehouse.`code`
LEFT JOIN inv_warehouse_sub iws ON io_order.invWarehouseCode = iws.`code`
@ -287,9 +289,9 @@
<select id="filterList" parameterType="com.glxp.sale.admin.req.inout.OrderFilterRequest"
resultType="com.glxp.sale.admin.entity.inout.OrderEntity">
SELECT io_order.* ,
inv_warehouse.name as invName,
inv_warehouse_sub.name as subInvName
FROM io_order
inv_warehouse.name as invName,
inv_warehouse_sub.name as subInvName
FROM io_order
LEFT JOIN inv_warehouse ON io_order.locStorageCode = inv_warehouse.`code`
LEFT JOIN inv_warehouse_sub ON inv_warehouse_sub.parentId = inv_warehouse.`code`
LEFT JOIN inv_warehouse_user on inv_warehouse_sub.code = inv_warehouse_user.`code`
@ -576,7 +578,9 @@
<select id="filterListByCode" parameterType="java.util.List"
resultType="com.glxp.sale.admin.entity.inout.OrderEntity">
SELECT * FROM io_order WHERE id IN
SELECT io_order.*,basic_bussiness_type.name billTypeName FROM io_order
left join basic_bussiness_type on io_order.action =basic_bussiness_type.action
WHERE io_order.id IN
<foreach collection="warehouseEntityList" item="item" open="(" separator="," close=")">
#{item.orderId}
</foreach>

Write Preview
Loading…
Cancel
Save