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

业务单据功能修改

Browse Source
pro
郑明梁 2 years ago
parent c3e32fd7ad
commit 66d890ab18
15 changed files with 99 additions and 15 deletions
Show Stats Download Patch File Download Diff File

11
src/main/java/com/glxp/api/controller/basic/UdiRlSupController.java
Unescape Escape View File

@ -29,6 +29,7 @@ import com.glxp.api.res.basic.UdiRlSupResponse;
import com.glxp.api.service.auth.AuthAdminService;
import com.glxp.api.service.basic.*;
import com.glxp.api.service.system.CompanyService;
import com.glxp.api.util.BeanCopyUtils;
import com.glxp.api.util.SupplementVailUtil;
import com.glxp.api.util.udi.FilterUdiUtils;
import org.springframework.validation.BindingResult;
@ -106,11 +107,13 @@ public class UdiRlSupController extends BaseController {
//只查找主标识产品信息
companyProductRelevanceRequest.setDiType(1);
}
List<UdiRlSupResponse> basicInstrumentMaintainRelevanceResponses = null;
basicInstrumentMaintainRelevanceResponses = udiRlSupService.filterUdiGp(companyProductRelevanceRequest);
PageInfo<UdiRlSupResponse> pageInfo;
List<UdiRelevanceResponse> basicInstrumentMaintainRelevanceResponses = null;
FilterUdiRelRequest filterUdiRelRequest=new FilterUdiRelRequest();
BeanCopyUtils.copy(companyProductRelevanceRequest,filterUdiRelRequest);
basicInstrumentMaintainRelevanceResponses = udiRelevanceService.filterUdiJoinSup(filterUdiRelRequest);
PageInfo<UdiRelevanceResponse> pageInfo;
pageInfo = new PageInfo<>(basicInstrumentMaintainRelevanceResponses);
PageSimpleResponse<UdiRlSupResponse> pageSimpleResponse = new PageSimpleResponse<>();
PageSimpleResponse<UdiRelevanceResponse> pageSimpleResponse = new PageSimpleResponse<>();
pageSimpleResponse.setTotal(pageInfo.getTotal());
pageSimpleResponse.setList(basicInstrumentMaintainRelevanceResponses);

9
src/main/java/com/glxp/api/controller/inout/IoOrderMutiController.java
Unescape Escape View File

@ -296,8 +296,15 @@ public class IoOrderMutiController {
return ResultVOUtils.error(999,"请先设置多次出库单据类型!");
}
ioOrderMutiRequest.setStatus(0);
List<IoOrderMutiResponse> ioOrderMutiEntityList = ioOrderMutiService.filterList(ioOrderMutiRequest);
return ResultVOUtils.success(ioOrderMutiEntityList);
if(ioOrderMutiEntityList.size()<0){
return ResultVOUtils.error(999,"该产品不存在此标识！");
}
if(ioOrderMutiEntityList.get(0).getReCount()<=0){
return ResultVOUtils.error(999,"该产品可使用数量不足！");
}
return ResultVOUtils.success(ioOrderMutiEntityList.get(0));
}
@PostMapping("/udiwms/inout/order/muti/selectMutiDetailList")

19
src/main/java/com/glxp/api/controller/purchase/IoPurChangeService.java
Unescape Escape View File

@ -185,10 +185,21 @@ public class IoPurChangeService {
String billNos = null;
//---------------------------------判断计划为已审核就生成计划单-------------------------------------------//\
if (purPlanEntity.getStatus() == 3) {
//查询计划详情
//查询有供应商计划详情
List<PurPlanDetailEntity> purPlanDetailEntityList = purPlanDetailService.findByOrderId(purPlanEntity.getId() + "");
List<PurPlanDetailEntity> purPlanDetailEntityList1 = new ArrayList<>(); //有供应商
List<PurPlanDetailEntity> purPlanDetailEntityList2 = new ArrayList<>(); //无供应商
for (PurPlanDetailEntity purPlanDetailEntity : purPlanDetailEntityList) {
if(StrUtil.isNotBlank(purPlanDetailEntity.getSupId())){
purPlanDetailEntityList1.add(purPlanDetailEntity);
}else{
purPlanDetailEntityList2.add(purPlanDetailEntity);
}
}
//根据供应商分组
Map<String, List<PurPlanDetailEntity>> purPlanDetailMap = purPlanDetailEntityList.stream().collect(Collectors.groupingBy(PurPlanDetailEntity::getSupId));
Map<String, List<PurPlanDetailEntity>> purPlanDetailMap = purPlanDetailEntityList1.stream().collect(Collectors.groupingBy(PurPlanDetailEntity::getSupId));
purPlanDetailMap.put("not",purPlanDetailEntityList2);
basicBusTypeChangeEntity = basicBusTypeChangeService.selectByOriginAction("CGJH");
if (basicBusTypeChangeEntity != null && StrUtil.isNotEmpty(basicBusTypeChangeEntity.getTargetBusAction()) && basicBusTypeChangeEntity.isEnable() == true) {
for (String key : purPlanDetailMap.keySet()) {
@ -196,7 +207,9 @@ public class IoPurChangeService {
List<PurPlanDetailEntity> purPlanDetailEntitys = purPlanDetailMap.get(key);
purOrderEntity.setBillNo(gennerOrderUtils.createStOrderNo(new OrderNoTypeBean(Constant.CG_ORDER, "yyyyMMdd")));
purOrderEntity.setBillDate(purPlanEntity.getBillDate());
purOrderEntity.setSupId(key);
if(!key.equals("not")){
purOrderEntity.setSupId(key);
}
purOrderEntity.setStatus(basicBusTypeChangeEntity.getBusAuditStatus());
purOrderEntity.setRemark(purPlanEntity.getRemark());
purOrderEntity.setEmergency(purPlanEntity.getEmergency());

13
src/main/java/com/glxp/api/controller/purchase/PurOrderController.java
Unescape Escape View File

@ -7,6 +7,7 @@ import com.glxp.api.annotation.RepeatSubmit;
import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils;
import com.glxp.api.constant.Constant;
import com.glxp.api.entity.basic.BasicCorpEntity;
import com.glxp.api.entity.purchase.PurApplyEntity;
import com.glxp.api.entity.purchase.PurOrderDetailEntity;
import com.glxp.api.entity.purchase.PurOrderEntity;
@ -384,4 +385,16 @@ public class PurOrderController {
return ResultVOUtils.success("删除成功");
}
/**
* 查询产品供应商
* @param purOrderDetailEntity
* @return
*/
@PostMapping("/purchase/order/filterSupList")
public BaseResponse filterSupList(@RequestBody PurOrderDetailEntity purOrderDetailEntity){
List<BasicCorpEntity> selectsupList=purOrderDetailService.selectsupList(purOrderDetailEntity);
return ResultVOUtils.success(selectsupList);
}
}

3
src/main/java/com/glxp/api/dao/purchase/PurOrderDetailDao.java
Unescape Escape View File

@ -1,6 +1,7 @@
package com.glxp.api.dao.purchase;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.glxp.api.entity.basic.BasicCorpEntity;
import com.glxp.api.entity.basic.BasicProductsEntity;
import com.glxp.api.entity.purchase.PurOrderDetailEntity;
import com.glxp.api.req.purchase.PurOrderDetailRequest;
@ -26,4 +27,6 @@ public interface PurOrderDetailDao extends BaseMapper<PurOrderDetailEntity> {
BasicProductsEntity selectIoOrderDetailBiz(@Param("id") long id);
List<PurOrderDetailResponse> selectDetailList(PurOrderDetailRequest purOrderDetailRequest);
List<BasicCorpEntity> selectsupList(PurOrderDetailEntity purOrderDetailEntity);
}

1
src/main/java/com/glxp/api/req/basic/CompanyProductRelevanceRequest.java
Unescape Escape View File

@ -24,6 +24,7 @@ public class CompanyProductRelevanceRequest extends ListPageRequest {
private String thirdCode;
private String thirdSys;
private String mainId;
private String lastUpdateTime;
private String zczbhhzbapzbh;

11
src/main/java/com/glxp/api/req/basic/FilterUdiRelRequest.java
Unescape Escape View File

@ -22,7 +22,7 @@ public class FilterUdiRelRequest extends ListPageRequest {
private String thirdId2;
private String thirdId3;
private String thirdId4;
private Boolean isDisable;
private String thirdCode;
private String thirdSys;
@ -40,9 +40,12 @@ public class FilterUdiRelRequest extends ListPageRequest {
private Boolean isCheck;
private Integer filterType; //0:全部，1.对照完成，2.未对照DI，3.未对照产品编码，4.未对照其他产品编码
private String customerId;
private String pinyinInitial;
private String code;
private Integer lockStatus;
private String customerId;
private String udplatCode;
private String mainId;
private Boolean isAdavence;
@ -52,8 +55,8 @@ public class FilterUdiRelRequest extends ListPageRequest {
private String ybbm;
private String sptm;
private String unionFilterStr;//产品名称，规格，批文，生产厂家联合查询
private String main;
private Boolean isDisable;
List<String> relIds;
private String uniqueNameCode;
private String supName;
@ -70,4 +73,6 @@ public class FilterUdiRelRequest extends ListPageRequest {
private Boolean dispatch;
private Boolean groupBuy;
private List<String> uuids;
}

2
src/main/java/com/glxp/api/req/purchase/PurPlanDetailRequest.java
Unescape Escape View File

@ -76,4 +76,6 @@ public class PurPlanDetailRequest extends ListPageRequest {
*/
private String manufactory;
private String checksupId;
}

4
src/main/java/com/glxp/api/res/basic/UdiRelevanceResponse.java
Unescape Escape View File

@ -32,6 +32,7 @@ public class UdiRelevanceResponse {
private String updateUser;
private String remark;
//UdiInfoEntity
private String originUuid;
private String nameCode;
@ -84,6 +85,7 @@ public class UdiRelevanceResponse {
private String basicPrductRemak7;
private String basicPrductRemak8;
private BigDecimal price;
private String PRId;
private Boolean isSelect;
@ -110,6 +112,8 @@ public class UdiRelevanceResponse {
private String classifyName; //物资分类名称
private Integer zdcfsycs;
private String customerId;
public int getBhzxxsbzsl() {
if (bhzxxsbzsl == null || bhzxxsbzsl == 0) {
return 1;

3
src/main/java/com/glxp/api/service/purchase/PurOrderDetailService.java
Unescape Escape View File

@ -1,6 +1,7 @@
package com.glxp.api.service.purchase;
import com.glxp.api.entity.basic.BasicCorpEntity;
import com.glxp.api.entity.basic.BasicProductsEntity;
import com.glxp.api.entity.purchase.PurOrderDetailEntity;
import com.glxp.api.req.purchase.PurOrderDetailRequest;
@ -32,4 +33,6 @@ public interface PurOrderDetailService {
BasicProductsEntity selectIoOrderDetailBiz(long id);
List<PurOrderDetailResponse> getDetailList(PurOrderDetailRequest purOrderDetailRequest);
List<BasicCorpEntity> selectsupList(PurOrderDetailEntity purOrderDetailEntity);
}

6
src/main/java/com/glxp/api/service/purchase/impl/PurOrderDetailServiceImpl.java
Unescape Escape View File

@ -2,6 +2,7 @@ package com.glxp.api.service.purchase.impl;
import com.github.pagehelper.PageHelper;
import com.glxp.api.dao.purchase.PurOrderDetailDao;
import com.glxp.api.entity.basic.BasicCorpEntity;
import com.glxp.api.entity.basic.BasicProductsEntity;
import com.glxp.api.entity.purchase.PurOrderDetailEntity;
import com.glxp.api.req.purchase.PurOrderDetailRequest;
@ -101,4 +102,9 @@ public class PurOrderDetailServiceImpl implements PurOrderDetailService {
}
return purOrderDetailDao.selectDetailList(purOrderDetailRequest);
}
@Override
public List<BasicCorpEntity> selectsupList(PurOrderDetailEntity purOrderDetailEntity) {
return purOrderDetailDao.selectsupList(purOrderDetailEntity);
}
}

8
src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml
Unescape Escape View File

@ -126,6 +126,7 @@
<select id="filterUdiJoinSup" parameterType="com.glxp.api.req.basic.FilterUdiRelRequest"
resultType="com.glxp.api.res.basic.UdiRelevanceResponse">
select basic_udirel.*,
basic_products.id as PRId,
basic_products.originUuid,
basic_products.nameCode,
basic_products.deviceRecordKey,
@ -178,6 +179,7 @@
basic_products.basicPrductRemak7,
basic_products.basicPrductRemak8,
company_product_relevance.unitFk,
basic_corp.erpId as customerId,
basic_corp.name companyName
FROM basic_udirel
inner JOIN basic_products
@ -192,6 +194,12 @@
<if test="supName != '' and supName != null">
AND supName LIKE concat('%', #{supName}, '%')
</if>
<if test="pinyinInitial != null and pinyinInitial != ''">
AND basic_products.pinyinInitial like concat('%', #{pinyinInitial}, '%')
</if>
<if test="ggxh != '' and ggxh != null">
AND ggxh LIKE concat('%', #{ggxh}, '%')
</if>
<if test="cpmctymc != '' and cpmctymc != null">
AND cpmctymc LIKE concat('%', #{cpmctymc}, '%')
</if>

4
src/main/resources/mybatis/mapper/purchase/PurApplyDetailDao.xml
Unescape Escape View File

@ -35,7 +35,7 @@
pur_apply_detail
INNER JOIN basic_udirel ON pur_apply_detail.productId = basic_udirel.id
INNER JOIN basic_products ON basic_udirel.uuid = basic_products.uuid
INNER JOIN basic_corp ON pur_apply_detail.supId = basic_corp.erpId
left JOIN basic_corp ON pur_apply_detail.supId = basic_corp.erpId
<where>
<if test="orderIdFk != '' and orderIdFk != null">
AND orderIdFk = #{orderIdFk}
@ -127,7 +127,7 @@
pur_apply_detail
INNER JOIN basic_udirel ON pur_apply_detail.productId = basic_udirel.id
INNER JOIN basic_products ON basic_udirel.uuid = basic_products.uuid
INNER JOIN basic_corp ON pur_apply_detail.supId = basic_corp.erpId
left JOIN basic_corp ON pur_apply_detail.supId = basic_corp.erpId
left join pur_apply on pur_apply.id = pur_apply_detail.orderIdFk
<where>
<if test="billNo != null and billNo != ''">

16
src/main/resources/mybatis/mapper/purchase/PurOrderDetailDao.xml
Unescape Escape View File

@ -181,4 +181,20 @@
and pur_order.status = 3
</where>
</select>
<select id="selectsupList" resultType="com.glxp.api.entity.basic.BasicCorpEntity">
SELECT
basic_corp.`name`,
basic_corp.erpId
FROM
basic_udirel
INNER JOIN basic_products ON basic_udirel.uuid = basic_products.uuid
INNER JOIN company_product_relevance ON company_product_relevance.udiRlIdFk = basic_udirel.id
INNER JOIN basic_corp ON basic_corp.erpId = company_product_relevance.customerId
<where>
<if test="productId != null">
AND basic_udirel.id = #{productId}
</if>
</where>
</select>
</mapper>

4
src/main/resources/mybatis/mapper/purchase/PurPlanDetailDao.xml
Unescape Escape View File

@ -35,7 +35,7 @@
pur_plan_detail
INNER JOIN basic_udirel ON pur_plan_detail.productId = basic_udirel.id
INNER JOIN basic_products ON basic_udirel.uuid = basic_products.uuid
INNER JOIN basic_corp ON pur_plan_detail.supId = basic_corp.erpId
left JOIN basic_corp ON pur_plan_detail.supId = basic_corp.erpId
<where>
<if test="orderIdFk != '' and orderIdFk != null">
AND orderIdFk = #{orderIdFk}
@ -144,7 +144,7 @@
pur_plan_detail
INNER JOIN basic_udirel ON pur_plan_detail.productId = basic_udirel.id
INNER JOIN basic_products ON basic_udirel.uuid = basic_products.uuid
INNER JOIN basic_corp ON pur_plan_detail.supId = basic_corp.erpId
left JOIN basic_corp ON pur_plan_detail.supId = basic_corp.erpId
left join pur_plan on pur_plan.id = pur_plan_detail.orderIdFk
<where>
<if test="billNo != null and billNo != ''">

Write Preview
Loading…
Cancel
Save