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

Merge remote-tracking branch 'origin/master'

Browse Source 
# Conflicts:
#	src/main/java/com/glxp/api/controller/basic/UdiRlSupController.java
master
郑明梁 2 years ago
parent 751dda3625 b1be9c7918
commit f6b819aced
13 changed files with 143 additions and 27 deletions

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

@ -77,6 +77,9 @@ public class UdiRlSupController {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
if (companyProductRelevanceRequest.getCustomerId().equals("110")) {
companyProductRelevanceRequest.setCustomerId(null);
}
companyProductRelevanceRequest.setIsDisable(false);
if (StrUtil.isNotEmpty(companyProductRelevanceRequest.getUdiCode())) {
UdiEntity udiEntity = FilterUdiUtils.getUdi(companyProductRelevanceRequest.getUdiCode());
@ -203,7 +206,7 @@ public class UdiRlSupController {
@AuthRuleAnnotation("")
@PostMapping("/sale/info/insertFilter")
public BaseResponse insertFilter(@RequestBody UdiInfoExportRequest udiInfoExportRequest) {
CompanyEntity companyEntity = companyService.findCompany(udiInfoExportRequest.getCustomerId()+"");
CompanyEntity companyEntity = companyService.findCompany(udiInfoExportRequest.getCustomerId() + "");
if (companyEntity.getUnitIdFk().equals("110")) {
udiInfoExportRequest.setUnitFk(null);
} else {
@ -211,7 +214,7 @@ public class UdiRlSupController {
}
//查询本企业有没有选择该产品有选择不能选择
CompanyProductRelevanceRequest companyProductRelevanceRequest = new CompanyProductRelevanceRequest();
companyProductRelevanceRequest.setCustomerId(udiInfoExportRequest.getCustomerId()+"");
companyProductRelevanceRequest.setCustomerId(udiInfoExportRequest.getCustomerId() + "");
List<CompanyProductRelevanceResponse> basicInstrumentMaintainRelevanceResponses = null;
companyProductRelevanceRequest.setDiType(1);
basicInstrumentMaintainRelevanceResponses = companyProductRelevanceService.filterUdiGp(companyProductRelevanceRequest);
@ -228,7 +231,7 @@ public class UdiRlSupController {
return ResultVOUtils.error(500, vailResult);
companyProductsRelService.insertCompanyProducts(udiInfoExportRequest);
UdiProductEntity udiProductEntity = new UdiProductEntity();
BeanUtils.copyProperties(udiInfoExportRequest.getSupplementRequest(),udiProductEntity);
BeanUtils.copyProperties(udiProductEntity,udiInfoExportRequest.getSupplementRequest());
udiProductService.insertUdiInfo(udiProductEntity);
return ResultVOUtils.success("后台正在导入，请稍后刷新查看！");
}

2
src/main/java/com/glxp/api/controller/inout/IoOrderReviewController.java
Unescape Escape View File

@ -284,7 +284,7 @@ public class IoOrderReviewController extends BaseController {
&& checkOrderCodesBean.getMyCount() == checkOrderCodesBean.getScanCount()) {
return Constant.CHECK_REPEAT;
}
int curCount = checkOrderCodesBean.getScanCount() + checkOrderCodesBean.getMyCount();
int curCount = checkOrderCodesBean.getScanCount() + calCountUtil.getActCount(checkOrderCodesBean.getRelId());
if (curCount == checkOrderCodesBean.getMyCount()) {
checkOrderCodesBean.setStatus(Constant.DB_CHECK_ED);
}

70
src/main/java/com/glxp/api/controller/purchase/PurDeliveryController.java
Unescape Escape View File

@ -13,12 +13,8 @@ import com.glxp.api.constant.ConstantType;
import com.glxp.api.entity.basic.BasicProductsEntity;
import com.glxp.api.entity.inout.IoOrderDetailBizEntity;
import com.glxp.api.entity.inout.IoOrderEntity;
import com.glxp.api.entity.purchase.PurApplyEntity;
import com.glxp.api.entity.purchase.PurDeliveryDetailEntity;
import com.glxp.api.entity.purchase.PurDeliveryEntity;
import com.glxp.api.req.purchase.PostPurDeliveryRequest;
import com.glxp.api.req.purchase.PurDeliveryRequest;
import com.glxp.api.req.purchase.PurOrderDetailRequest;
import com.glxp.api.entity.purchase.*;
import com.glxp.api.req.purchase.*;
import com.glxp.api.res.PageSimpleResponse;
import com.glxp.api.res.purchase.PurDeliveryDetailResponse;
import com.glxp.api.res.purchase.PurDeliveryResponse;
@ -27,20 +23,19 @@ import com.glxp.api.service.inout.IoOrderDetailBizService;
import com.glxp.api.service.inout.IoOrderService;
import com.glxp.api.service.purchase.PurDeliveryDetailService;
import com.glxp.api.service.purchase.PurDeliveryService;
import com.glxp.api.service.purchase.PurOrderDetailService;
import com.glxp.api.util.CustomUtil;
import com.glxp.api.util.GennerOrderUtils;
import com.glxp.api.util.OrderNoTypeBean;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.BeanUtils;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import javax.validation.constraints.NotEmpty;
import java.math.BigDecimal;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.*;
import java.util.stream.Collectors;
@Validated
@ -138,7 +133,7 @@ public class PurDeliveryController {
/**
* 审核采购订单
* 审核送货单
*/
@RepeatSubmit()
@PostMapping("/purchase/delivery/auditOrder")
@ -300,4 +295,57 @@ public class PurDeliveryController {
return ResultVOUtils.success("删除成功");
}
@Resource
PurOrderDetailService purOrderDetailService;
/**
* 添加采购订单至送货单
*/
@PostMapping("/purchase/delivery/addPlanDetailAndOrder")
public BaseResponse addPlanDetailAndOrder(@RequestBody PurDeliveryRequest purDeliveryRequest) {
// List<PurOrderDetailEntity> purOrderDetailEntities = purOrderDetailService.findByOrderId(purOrderEntity.getBillNo());
//
// List<PurDeliveryDetailEntity> purDeliveryDetailEntities = purOrderDetailEntities.stream()
// .map(e -> {
// PurDeliveryDetailEntity d = new PurDeliveryDetailEntity();
// BeanUtils.copyProperties(e, d);
// return d;
// })
// .collect(Collectors.toList());
//
// for (PurDeliveryDetailEntity obj : purDeliveryDetailEntities) {
// obj.setOrderIdFk(purOrderEntity.getId() + "");
// }
// //获取详情表信息
// List<PurOrderDetailEntity> exitsDetails = purDeliveryDetailService.findByOrderId();
//
//
// List<Long> ids = new ArrayList<>();
// for (PurOrderDetailEntity obj : purOrderDetailEntities) {
// for (PurOrderDetailEntity obj1 : purOrderDetailEntityList) {
// if (obj.getProductId().equals(obj1.getProductId())) {
// //获取存在在详情表和申购单里面一样的产品
// ids.add(obj.getId().longValue());
// break;
// }
// }
// }
// //删除存在的产品
// if (ids.size() > 0) {
// purOrderDetailService.deleteByIds(ids);
// }
//
// boolean falg = purOrderDetailService.insertPurOrderDetailEntity(purOrderDetailEntityList);
// if (falg) {
// //查询申购单
// return ResultVOUtils.success("添加成功");
//
// } else {
// return ResultVOUtils.success("添加失败");
// }
return ResultVOUtils.success("添加失败");
}
}

7
src/main/java/com/glxp/api/entity/purchase/PurArrivalDetailEntity.java
Unescape Escape View File

@ -49,5 +49,10 @@ public class PurArrivalDetailEntity {
*/
@TableField(value = "zczbhhzbapzbh")
private String zczbhhzbapzbh;
@TableField(value = "batchNo")
private String batchNo;
@TableField(value = "productDate")
private String productDate;
@TableField(value = "expireDate")
private String expireDate;
}

8
src/main/java/com/glxp/api/entity/purchase/PurDeliveryDetailEntity.java
Unescape Escape View File

@ -49,4 +49,12 @@ public class PurDeliveryDetailEntity {
@TableField(value = "zczbhhzbapzbh")
private String zczbhhzbapzbh;
@TableField(value = "batchNo")
private String batchNo;
@TableField(value = "productDate")
private String productDate;
@TableField(value = "expireDate")
private String expireDate;
}

2
src/main/java/com/glxp/api/entity/purchase/PurOrderDetailEntity.java
Unescape Escape View File

@ -61,4 +61,4 @@ public class PurOrderDetailEntity {
public static final String COL_SUPID = "supId";
public static final String COL_ZCZBHHZBAPZBH = "zczbhhzbapzbh";
}
}

8
src/main/java/com/glxp/api/entity/purchase/PurReturnedDetailEntity.java
Unescape Escape View File

@ -49,4 +49,12 @@ public class PurReturnedDetailEntity {
@TableField(value = "zczbhhzbapzbh")
private String zczbhhzbapzbh;
@TableField(value = "batchNo")
private String batchNo;
@TableField(value = "productDate")
private String productDate;
@TableField(value = "expireDate")
private String expireDate;
}

4
src/main/java/com/glxp/api/req/purchase/PurDeliveryRequest.java
Unescape Escape View File

@ -8,7 +8,7 @@ import java.util.Date;
@Data
public class PurDeliveryRequest extends ListPageRequest {
private Long id;
private Long id; //送货单ID
/**
* 单据号
@ -65,6 +65,6 @@ public class PurDeliveryRequest extends ListPageRequest {
private String startDate;
private String endDate;
private Long applyId;
private Long purOrderId; //采购订单ID
}

4
src/main/resources/mybatis/mapper/auth/DeptDao.xml
Unescape Escape View File

@ -175,7 +175,7 @@
<select id="getIdByCode" resultType="java.lang.Long">
select id
from auth_dept
where code = #{fromCorpId}
where id = #{fromCorpId}
</select>
<insert id="insertInvWarehouse" keyProperty="id"
parameterType="com.glxp.api.entity.auth.DeptEntity">
@ -283,4 +283,4 @@
<select id="selectNameByCode" resultType="java.lang.String">
select name from auth_dept where code = #{code}
</select>
</mapper>
</mapper>

14
src/main/resources/mybatis/mapper/purchase/PurArrivalDetailDao.xml
Unescape Escape View File

@ -81,6 +81,15 @@
<if test="zczbhhzbapzbh != null">
zczbhhzbapzbh=#{zczbhhzbapzbh},
</if>
<if test="batchNo != null">
batchNo=#{batchNo},
</if>
<if test="productDate != null">
productDate=#{productDate},
</if>
<if test="expireDate != null">
expireDate=#{expireDate},
</if>
</trim>
WHERE id = #{id}
</update>
@ -89,7 +98,8 @@
<insert id="insertPurArrivalDetailEntity" keyProperty="id"
parameterType="com.glxp.api.entity.purchase.PurArrivalDetailEntity">
REPLACE INTO pur_arrival_detail
(orderIdFk, productId, productName, count, supId, zczbhhzbapzbh) values
(orderIdFk, productId, productName, count, supId, zczbhhzbapzbh, batchNo, productDate,
expireDate) values
<foreach collection="datas" item="item" index="index" separator=",">
(#{item.orderIdFk},
@ -97,7 +107,7 @@
#{item.productName},
#{item.count},
#{item.supId},
#{item.zczbhhzbapzbh})
#{item.zczbhhzbapzbh}, #{item.batchNo}, #{item.productDate}, #{item.expireDate})
</foreach>
</insert>

14
src/main/resources/mybatis/mapper/purchase/PurDeliveryDetailDao.xml
Unescape Escape View File

@ -81,6 +81,15 @@
<if test="zczbhhzbapzbh != null">
zczbhhzbapzbh=#{zczbhhzbapzbh},
</if>
<if test="batchNo != null">
batchNo=#{batchNo},
</if>
<if test="productDate != null">
productDate=#{productDate},
</if>
<if test="expireDate != null">
expireDate=#{expireDate},
</if>
</trim>
WHERE id = #{id}
</update>
@ -89,7 +98,8 @@
<insert id="insertPurDeliveryDetailEntity" keyProperty="id"
parameterType="com.glxp.api.entity.purchase.PurDeliveryDetailEntity">
REPLACE INTO pur_delivery_detail
(orderIdFk, productId, productName, count, supId, zczbhhzbapzbh) values
(orderIdFk, productId, productName, count, supId, zczbhhzbapzbh, batchNo, productDate,
expireDate) values
<foreach collection="datas" item="item" index="index" separator=",">
(#{item.orderIdFk},
@ -97,7 +107,7 @@
#{item.productName},
#{item.count},
#{item.supId},
#{item.zczbhhzbapzbh})
#{item.zczbhhzbapzbh}, #{item.batchNo}, #{item.productDate}, #{item.expireDate})
</foreach>
</insert>

14
src/main/resources/mybatis/mapper/purchase/PurReturnedDetailDao.xml
Unescape Escape View File

@ -81,6 +81,15 @@
<if test="zczbhhzbapzbh != null">
zczbhhzbapzbh=#{zczbhhzbapzbh},
</if>
<if test="batchNo != null">
batchNo=#{batchNo},
</if>
<if test="productDate != null">
productDate=#{productDate},
</if>
<if test="expireDate != null">
expireDate=#{expireDate},
</if>
</trim>
WHERE id = #{id}
</update>
@ -89,7 +98,8 @@
<insert id="insertPurReturnedDetailEntity" keyProperty="id"
parameterType="com.glxp.api.entity.purchase.PurReturnedDetailEntity">
REPLACE INTO pur_returned_detail
(orderIdFk, productId, productName, count, supId, zczbhhzbapzbh) values
(orderIdFk, productId, productName, count, supId, zczbhhzbapzbh, batchNo, productDate,
expireDate) values
<foreach collection="datas" item="item" index="index" separator=",">
(#{item.orderIdFk},
@ -97,7 +107,7 @@
#{item.productName},
#{item.count},
#{item.supId},
#{item.zczbhhzbapzbh})
#{item.zczbhhzbapzbh}, #{item.batchNo}, #{item.productDate}, #{item.expireDate})
</foreach>
</insert>

14
src/main/resources/schemas/schema_v2.1.sql
Unescape Escape View File

@ -19,3 +19,17 @@ CALL Pro_Temp_ColumnWork('basic_udirel', 'dispatch', 'tinyint', 1);
CALL Pro_Temp_ColumnWork('basic_udirel', 'groupBuy', 'tinyint', 1);
CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'vailDispatch', 'tinyint', 1);
CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'vailGroupBuy', 'tinyint', 1);
CALL Pro_Temp_ColumnWork('pur_delivery_detail', 'batchNo', 'varchar(255) ', 1);
CALL Pro_Temp_ColumnWork('pur_delivery_detail', 'productDate', 'varchar(255) ', 1);
CALL Pro_Temp_ColumnWork('pur_delivery_detail', 'expireDate', 'varchar(255) ', 1);
CALL Pro_Temp_ColumnWork('pur_arrival_detail', 'batchNo', 'varchar(255) ', 1);
CALL Pro_Temp_ColumnWork('pur_arrival_detail', 'productDate', 'varchar(255) ', 1);
CALL Pro_Temp_ColumnWork('pur_arrival_detail', 'expireDate', 'varchar(255) ', 1);
CALL Pro_Temp_ColumnWork('pur_returned_detail', 'batchNo', 'varchar(255) ', 1);
CALL Pro_Temp_ColumnWork('pur_returned_detail', 'productDate', 'varchar(255) ', 1);
CALL Pro_Temp_ColumnWork('pur_returned_detail', 'expireDate', 'varchar(255) ', 1);

Write Preview
Loading…
Cancel
Save