申购单据,采购订单等相关修改

dev
anthonywj 2 years ago
parent 562cbd5ac2
commit fce5d7b7c6

@ -114,7 +114,6 @@ public class InvWarehouseController extends BaseController {
@AuthRuleAnnotation("")
@GetMapping("spms/inv/warehouse/filterGroupBySpuse")
public BaseResponse filterGroupBySpuse(FilterInvWarehouseRequest filterInvWarehouseRequest) {
// filterInvWarehouseRequest.setUserId(getUserId());
List<InvWarehouseEntity> invSubWarehouseEntities = invWarehouseService.filterGroupBySpuse(filterInvWarehouseRequest);
return ResultVOUtils.success(invSubWarehouseEntities);
}

@ -122,7 +122,7 @@ public class IoPurChangeService {
PurPlanEntity purPlanEntity = new PurPlanEntity();
List<PurPlanDetailEntity> purPlanDetailEntityList = new ArrayList<>();
if (purApplyEntity.getStatus() == 3) {
basicBusTypeChangeEntity = basicBusTypeChangeService.selectByOriginAction("CPSG");
basicBusTypeChangeEntity = basicBusTypeChangeService.selectByOriginAction(ConstantStatus.BUS_ORDER_CPSG);
if (basicBusTypeChangeEntity != null && StrUtil.isNotEmpty(basicBusTypeChangeEntity.getTargetBusAction()) && basicBusTypeChangeEntity.isEnable() == true) {
purPlanEntity.setBillNo(gennerOrderUtils.createStOrderNo(new OrderNoTypeBean(Constant.JH_ORDER, "yyyyMMdd")));
purPlanEntity.setBillDate(purApplyEntity.getBillDate());
@ -131,6 +131,7 @@ public class IoPurChangeService {
purPlanEntity.setEmergency(purApplyEntity.getEmergency());
purPlanEntity.setArrivalTime(purApplyEntity.getArrivalTime());
purPlanEntity.setInvCode(purApplyEntity.getTargetInvCode());
purPlanEntity.setBillType(ConstantStatus.BUS_ORDER_CGJH);
purPlanEntity.setDeptCode(purApplyEntity.getTargetDeptCode());
purPlanEntity.setCreateUser(purApplyEntity.getAuditUser());
purPlanEntity.setApplyCreateUser(purApplyEntity.getCreateUser());
@ -202,7 +203,7 @@ public class IoPurChangeService {
//根据供应商分组
Map<String, List<PurPlanDetailEntity>> purPlanDetailMap = purPlanDetailEntityList1.stream().collect(Collectors.groupingBy(PurPlanDetailEntity::getSupId));
purPlanDetailMap.put("not", purPlanDetailEntityList2);
basicBusTypeChangeEntity = basicBusTypeChangeService.selectByOriginAction("CGJH");
basicBusTypeChangeEntity = basicBusTypeChangeService.selectByOriginAction(ConstantStatus.BUS_ORDER_CGJH);
if (basicBusTypeChangeEntity != null && StrUtil.isNotEmpty(basicBusTypeChangeEntity.getTargetBusAction()) && basicBusTypeChangeEntity.isEnable() == true) {
for (String key : purPlanDetailMap.keySet()) {
PurOrderEntity purOrderEntity = new PurOrderEntity();
@ -227,6 +228,7 @@ public class IoPurChangeService {
purOrderEntity.setApplyInv(purPlanEntity.getApplyInv());
purOrderEntity.setCreateUser(purPlanEntity.getAuditUser());
purOrderEntity.setUpdateUser(purPlanEntity.getAuditUser());
purOrderEntity.setBillType(ConstantStatus.BUS_ORDER_CGDD);
if (basicBusTypeChangeEntity.getBusBeforeTime() != null) {
purOrderEntity.setCreateTime(MsDateUtil.timeProcess(new Date(), basicBusTypeChangeEntity.getBusBeforeTime()));
purOrderEntity.setUpdateTime(MsDateUtil.timeProcess(new Date(), basicBusTypeChangeEntity.getBusBeforeTime()));
@ -420,7 +422,7 @@ public class IoPurChangeService {
//采购计划生成扫码单据
public void purPlanGen(PurPlanEntity purPlanEntity) {
BasicBusTypeChangeEntity basicBusTypeChangeEntity = new BasicBusTypeChangeEntity();
basicBusTypeChangeEntity = basicBusTypeChangeService.selectByOriginAction("CGJH");
basicBusTypeChangeEntity = basicBusTypeChangeService.selectByOriginAction(ConstantStatus.BUS_ORDER_CGJH);
List<PurPlanDetailEntity> purPlanDetailEntities = purPlanDetailService.findByOrderId(purPlanEntity.getId() + "");
//对计划单里面的供应商进行分组
Map<String, List<PurPlanDetailEntity>> map = purPlanDetailEntities.stream().collect(Collectors.groupingBy(PurPlanDetailEntity::getSupId));

@ -90,6 +90,7 @@ public class PurApplyController {
purApplyEntity.setCreateUser(userId + "");
purApplyEntity.setCreateTime(new Date());
purApplyEntity.setUpdateTime(new Date());
purApplyEntity.setBillType(ConstantStatus.BUS_ORDER_CPSG);
purApplyEntity.setStatus(postPurApplyRequest.getEditStatus()); //草稿状态
if (postPurApplyRequest.getType() != null) {
String billNo = gennerOrderUtils.createStOrderNo(new OrderNoTypeBean(Constant.SG_ORDER, "yyyyMMdd"));
@ -109,7 +110,7 @@ public class PurApplyController {
*
*/
@PostMapping("/purchase/apply/list")
public BaseResponse list(@RequestBody PurApplyRequest purApplyRequest) {
public BaseResponse list(@RequestBody PurApplyRequest purApplyRequest) {
if (purApplyRequest.getStatus() == null) {
purApplyRequest.setStatus(11); //查询未审核和草稿状态
@ -130,12 +131,11 @@ public class PurApplyController {
*
*/
@PostMapping("/purchase/apply/auditList")
public BaseResponse auditList(@RequestBody PurApplyRequest purApplyRequest) {
public BaseResponse auditList(@RequestBody PurApplyRequest purApplyRequest) {
if (purApplyRequest.getStatus() == null) {
purApplyRequest.setStatus(10); //查询未审核和已审核状态
}
List<PurApplyResponse> purApplyEntities = purApplyService.queryPageList(purApplyRequest);
PageInfo<PurApplyResponse> pageInfo;
pageInfo = new PageInfo<>(purApplyEntities);
@ -214,7 +214,7 @@ public class PurApplyController {
PurPlanEntity purPlanEntity = new PurPlanEntity();
List<PurPlanDetailEntity> purPlanDetailEntityList = new ArrayList<>();
if (purApplyEntity.getStatus() == 3) {
basicBusTypeChangeEntity = basicBusTypeChangeService.selectByOriginAction("CPSG");
basicBusTypeChangeEntity = basicBusTypeChangeService.selectByOriginAction(ConstantStatus.BUS_ORDER_CPSG);
if (basicBusTypeChangeEntity != null && StrUtil.isNotEmpty(basicBusTypeChangeEntity.getTargetBusAction()) && basicBusTypeChangeEntity.isEnable() == true) {
purPlanEntity.setBillNo(gennerOrderUtils.createStOrderNo(new OrderNoTypeBean(Constant.JH_ORDER, "yyyyMMdd")));
purPlanEntity.setBillDate(purApplyEntity.getBillDate());
@ -255,7 +255,7 @@ public class PurApplyController {
//---------------------------------判断计划为已审核就生成计划单-------------------------------------------//\
PurOrderEntity purOrderEntity = new PurOrderEntity();
if (purPlanEntity.getStatus() == 3) {
basicBusTypeChangeEntity = basicBusTypeChangeService.selectByOriginAction("CGJH");
basicBusTypeChangeEntity = basicBusTypeChangeService.selectByOriginAction(ConstantStatus.BUS_ORDER_CGJH);
if (basicBusTypeChangeEntity != null && StrUtil.isNotEmpty(basicBusTypeChangeEntity.getTargetBusAction()) && basicBusTypeChangeEntity.isEnable() == true) {
purOrderEntity.setBillNo(gennerOrderUtils.createStOrderNo(new OrderNoTypeBean(Constant.CG_ORDER, "yyyyMMdd")));
purOrderEntity.setBillDate(purApplyEntity.getBillDate());
@ -477,15 +477,15 @@ public class PurApplyController {
*/
@RepeatSubmit()
@PostMapping("/purchase/apply/addDetail")
public BaseResponse addDetail(@RequestBody List<PurApplyDetailEntity> list) {
public BaseResponse addDetail(@RequestBody List<PurApplyDetailEntity> list) {
if(list.size()!=0) {
if (list.size() != 0) {
for (PurApplyDetailEntity purApplyDetailEntity : list) {
purApplyDetailService.insert(purApplyDetailEntity);
}
return ResultVOUtils.success(list.get(0).getOrderIdFk());
}
return ResultVOUtils.error(555,"请选择数据!");
return ResultVOUtils.error(555, "请选择数据!");
}
/**

@ -9,6 +9,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.constant.ConstantStatus;
import com.glxp.api.entity.basic.BasicCorpEntity;
import com.glxp.api.entity.inv.InvProductDetailEntity;
import com.glxp.api.entity.purchase.*;
@ -80,13 +81,13 @@ public class PurOrderController {
Long userId = customerService.getUserId();
PurOrderEntity purOrderEntity = postPurOrderRequest.getPurOrderEntity();
Long id=purOrderEntity.getId();
Long id = purOrderEntity.getId();
purOrderEntity.setCreateUser(userId + "");
purOrderEntity.setCreateTime(new Date());
purOrderEntity.setUpdateTime(new Date());
purOrderEntity.setUpdateUser(userId + "");
purOrderEntity.setStatus(postPurOrderRequest.getEditStatus()); //草稿状态
purOrderEntity.setBillType(ConstantStatus.BUS_ORDER_CGDD);
if (postPurOrderRequest.getType() != null) {
String billNo = gennerOrderUtils.createStOrderNo(new OrderNoTypeBean(Constant.CG_ORDER, "yyyyMMdd"));
purOrderEntity.setBillNo(billNo);

@ -309,7 +309,7 @@ public class PurOrderReceiveController extends BaseController {
PurPlanEntity purPlanEntity = new PurPlanEntity();
List<PurPlanDetailEntity> purPlanDetailEntityList = new ArrayList<>();
if (purApplyEntity.getStatus() == 3) {
basicBusTypeChangeEntity = basicBusTypeChangeService.selectByOriginAction("CPSG");
basicBusTypeChangeEntity = basicBusTypeChangeService.selectByOriginAction(ConstantStatus.BUS_ORDER_CPSG);
if (basicBusTypeChangeEntity != null && StrUtil.isNotEmpty(basicBusTypeChangeEntity.getTargetBusAction()) && basicBusTypeChangeEntity.isEnable() == true) {
purPlanEntity.setBillNo(gennerOrderUtils.createStOrderNo(new OrderNoTypeBean(Constant.JH_ORDER, "yyyyMMdd")));
purPlanEntity.setBillDate(purReceiveEntity.getBillDate());
@ -349,7 +349,7 @@ public class PurOrderReceiveController extends BaseController {
//---------------------------------判断计划为已审核就生成计划单-------------------------------------------//\
PurOrderEntity purOrderEntity = new PurOrderEntity();
if (purPlanEntity.getStatus() == 3) {
basicBusTypeChangeEntity = basicBusTypeChangeService.selectByOriginAction("CGJH");
basicBusTypeChangeEntity = basicBusTypeChangeService.selectByOriginAction(ConstantStatus.BUS_ORDER_CGJH);
if (basicBusTypeChangeEntity != null && StrUtil.isNotEmpty(basicBusTypeChangeEntity.getTargetBusAction()) && basicBusTypeChangeEntity.isEnable() == true) {
purOrderEntity.setBillNo(gennerOrderUtils.createStOrderNo(new OrderNoTypeBean(Constant.CG_ORDER, "yyyyMMdd")));
purOrderEntity.setBillDate(purReceiveEntity.getBillDate());

@ -94,7 +94,7 @@ public class PurPlanController {
purPlanEntity.setUpdateTime(new Date());
purPlanEntity.setUpdateUser(userId + "");
purPlanEntity.setStatus(postPurPlanRequest.getEditStatus()); //草稿状态
purPlanEntity.setBillType(ConstantStatus.BUS_ORDER_CGJH);
if (postPurPlanRequest.getType() != null) {
String billNo = gennerOrderUtils.createStOrderNo(new OrderNoTypeBean(Constant.SG_ORDER, "yyyyMMdd"));
purPlanEntity.setBillNo(billNo);
@ -262,7 +262,7 @@ public class PurPlanController {
//---------------------------------判断计划为已审核就生成计划单-------------------------------------------//\
PurOrderEntity purOrderEntity = new PurOrderEntity();
if (purPlanEntity.getStatus() == 3) {
basicBusTypeChangeEntity = basicBusTypeChangeService.selectByOriginAction("CGJH");
basicBusTypeChangeEntity = basicBusTypeChangeService.selectByOriginAction(ConstantStatus.BUS_ORDER_CGJH);
if (basicBusTypeChangeEntity != null && StrUtil.isNotEmpty(basicBusTypeChangeEntity.getTargetBusAction()) && basicBusTypeChangeEntity.isEnable() == true) {
purOrderEntity.setBillNo(gennerOrderUtils.createStOrderNo(new OrderNoTypeBean(Constant.CG_ORDER, "yyyyMMdd")));
purOrderEntity.setBillDate(purPlanEntity.getBillDate());

@ -21,8 +21,8 @@ import javax.annotation.Resource;
import java.util.Arrays;
//@Component
//@EnableScheduling
@Component
@EnableScheduling
public class SyncHeartTask implements SchedulingConfigurer {
final Logger logger = LoggerFactory.getLogger(SyncHeartTask.class);

@ -2,45 +2,54 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="com.glxp.api.dao.purchase.PurApplyDao">
<select id="queryPageList" parameterType="com.glxp.api.req.purchase.PurApplyRequest"
resultType="com.glxp.api.res.purchase.PurApplyResponse">
SELECT
pur_apply.*,
cb.employeeName createByName,
ab.employeeName auditByName,
auth_warehouse.`name` targetInvName,
auth_dept.`name` targetDeptName
FROM
pur_apply
LEFT JOIN auth_user cb ON pur_apply.createUser = cb.id
LEFT JOIN auth_user ab ON pur_apply.auditUser = ab.id
LEFT JOIN auth_warehouse ON pur_apply.targetInvCode = auth_warehouse.`code`
LEFT JOIN auth_dept ON auth_dept.`code` = pur_apply.targetDeptCode
SELECT pur_apply.*,
cb.employeeName createByName,
ab.employeeName auditByName,
auth_warehouse.`name` targetInvName,
auth_dept.`name` targetDeptName,
aw1.`name` invName,
ad1.`name` deptName
FROM pur_apply
LEFT JOIN auth_user cb ON pur_apply.createUser = cb.id
LEFT JOIN auth_user ab ON pur_apply.auditUser = ab.id
LEFT JOIN auth_warehouse ON pur_apply.targetInvCode = auth_warehouse.`code`
LEFT JOIN auth_dept ON auth_dept.`code` = pur_apply.targetDeptCode
LEFT JOIN auth_warehouse aw1 ON pur_apply.invCode = aw1.`code`
LEFT JOIN auth_dept ad1 ON ad1.`code` = pur_apply.deptCode
<where>
<if test="billNo != '' and billNo != null">
AND billNo = #{billNo}
</if>
<if test="startDate != null and startDate !=''">
<![CDATA[ and DATE_FORMAT(pur_apply.createTime,'%Y-%m-%d')>= #{startDate}]]>
<if test="startDate != null and startDate != ''">
<![CDATA[
and DATE_FORMAT(pur_apply.createTime, '%Y-%m-%d') >= #{startDate}
]]>
</if>
<if test="endDate != null and endDate !=''">
<![CDATA[ and DATE_FORMAT(pur_apply.createTime,'%Y-%m-%d') <= #{endDate}]]>
<if test="endDate != null and endDate != ''">
<![CDATA[
and DATE_FORMAT(pur_apply.createTime, '%Y-%m-%d') <= #{endDate}
]]>
</if>
<if test="startAuditDate != null and startAuditDate !=''">
<![CDATA[ and DATE_FORMAT(pur_apply.auditTime,'%Y-%m-%d')>= #{startAuditDate}]]>
<if test="startAuditDate != null and startAuditDate != ''">
<![CDATA[
and DATE_FORMAT(pur_apply.auditTime, '%Y-%m-%d') >= #{startAuditDate}
]]>
</if>
<if test="endAuditDate != null and endAuditDate !=''">
<![CDATA[ and DATE_FORMAT(pur_apply.auditTime,'%Y-%m-%d') <= #{endAuditDate}]]>
<if test="endAuditDate != null and endAuditDate != ''">
<![CDATA[
and DATE_FORMAT(pur_apply.auditTime, '%Y-%m-%d') <= #{endAuditDate}
]]>
</if>
<if test="status!=null and status!=10 and status!=11">
<if test="status != null and status != 10 and status != 11">
and pur_apply.status = #{status}
</if>
<if test="status ==10">
and ( pur_apply.status = 3 or pur_apply.status=2 or pur_apply.status=4)
<if test="status == 10">
and (pur_apply.status = 3 or pur_apply.status = 2 or pur_apply.status = 4)
</if>
<if test="status ==11">
and ( pur_apply.status = 1 or pur_apply.status=2 or pur_apply.status=4)
<if test="status == 11">
and (pur_apply.status = 1 or pur_apply.status = 2 or pur_apply.status = 4)
</if>
<if test="deptCode != '' and deptCode != null">
@ -69,8 +78,8 @@
</if>
</where>
<choose>
<when test="(orderBy!=null ) and (sort=='desc' or sort=='asc')">
order by ${orderBy} ${sort}
<when test="(orderBy != null) and (sort == 'desc' or sort == 'asc')">
order by ${orderBy} ${sort}
</when>
<otherwise>
ORDER BY updateTime DESC
@ -81,75 +90,110 @@
<insert id="insert" keyProperty="id" keyColumn="id"
parameterType="com.glxp.api.entity.purchase.PurApplyEntity" useGeneratedKeys="true">
replace
INTO pur_apply
(
billNo,billDate,status,billType,remark,invCode,
deptCode,createUser,createTime,auditUser,auditTime,updateTime,updateUser ,auditRemark,
targetInvCode,targetDeptCode,planBillNo,generatePlan,emergency,arrivalTime
)
values (
#{billNo},
#{billDate},
#{status},
#{billType},
#{remark},
#{invCode},
#{deptCode},
#{createUser},
#{createTime},
#{auditUser},
#{auditTime},
#{updateTime},
#{updateUser},
#{auditRemark},
#{targetInvCode},
#{targetDeptCode},
#{planBillNo},#{generatePlan},
#{emergency},#{arrivalTime}
)
INTO pur_apply
(billNo, billDate, status, billType, remark, invCode,
deptCode, createUser, createTime, auditUser, auditTime, updateTime, updateUser, auditRemark,
targetInvCode, targetDeptCode, planBillNo, generatePlan, emergency, arrivalTime)
values (#{billNo},
#{billDate},
#{status},
#{billType},
#{remark},
#{invCode},
#{deptCode},
#{createUser},
#{createTime},
#{auditUser},
#{auditTime},
#{updateTime},
#{updateUser},
#{auditRemark},
#{targetInvCode},
#{targetDeptCode},
#{planBillNo}, #{generatePlan},
#{emergency}, #{arrivalTime})
</insert>
<delete id="deleteByIds" parameterType="java.util.List">
DELETE FROM pur_apply WHERE id in
DELETE
FROM pur_apply WHERE id in
<foreach collection="ids" item="item" open="(" separator="," close=")">
#{item}
</foreach>
</delete>
<delete id="deleteById" parameterType="long">
DELETE FROM pur_apply
DELETE
FROM pur_apply
WHERE id = #{id}
</delete>
<update id="update" parameterType="com.glxp.api.entity.purchase.PurApplyEntity">
UPDATE pur_apply
<trim prefix="set" suffixOverrides=",">
<if test="billNo != null">billNo=#{billNo},</if>
<if test="billDate != null">billDate=#{billDate},</if>
<if test="status != null">status=#{status},</if>
<if test="billType != null">billType=#{billType},</if>
<if test="remark != null">remark=#{remark},</if>
<if test="invCode != null">invCode=#{invCode},</if>
<if test="deptCode != null">deptCode=#{deptCode},</if>
<if test="auditUser != null">auditUser=#{auditUser},</if>
<if test="auditTime != null">auditTime=#{auditTime},</if>
<if test="createUser != null">createUser=#{createUser},</if>
<if test="createTime != null">createTime=#{createTime},</if>
<if test="updateTime != null">updateTime=#{updateTime},</if>
<if test="updateUser != null">updateUser=#{updateUser},</if>
<if test="auditRemark != null">auditRemark=#{auditRemark},</if>
<if test="targetInvCode != null">targetInvCode=#{targetInvCode},</if>
<if test="targetDeptCode != null">targetDeptCode=#{targetDeptCode},</if>
<if test="planBillNo != null">planBillNo=#{planBillNo},</if>
<if test="generatePlan != null">generatePlan=#{generatePlan},</if>
<if test="emergency != null">emergency=#{emergency},</if>
<if test="arrivalTime != null">arrivalTime=#{arrivalTime},</if>
<if test="billNo != null">
billNo=#{billNo},
</if>
<if test="billDate != null">
billDate=#{billDate},
</if>
<if test="status != null">
status=#{status},
</if>
<if test="billType != null">
billType=#{billType},
</if>
<if test="remark != null">
remark=#{remark},
</if>
<if test="invCode != null">
invCode=#{invCode},
</if>
<if test="deptCode != null">
deptCode=#{deptCode},
</if>
<if test="auditUser != null">
auditUser=#{auditUser},
</if>
<if test="auditTime != null">
auditTime=#{auditTime},
</if>
<if test="createUser != null">
createUser=#{createUser},
</if>
<if test="createTime != null">
createTime=#{createTime},
</if>
<if test="updateTime != null">
updateTime=#{updateTime},
</if>
<if test="updateUser != null">
updateUser=#{updateUser},
</if>
<if test="auditRemark != null">
auditRemark=#{auditRemark},
</if>
<if test="targetInvCode != null">
targetInvCode=#{targetInvCode},
</if>
<if test="targetDeptCode != null">
targetDeptCode=#{targetDeptCode},
</if>
<if test="planBillNo != null">
planBillNo=#{planBillNo},
</if>
<if test="generatePlan != null">
generatePlan=#{generatePlan},
</if>
<if test="emergency != null">
emergency=#{emergency},
</if>
<if test="arrivalTime != null">
arrivalTime=#{arrivalTime},
</if>
</trim>
WHERE id = #{id}
</update>
</mapper>

@ -361,6 +361,11 @@ CALL Pro_Temp_ColumnWork('auth_warehouse_bustype', 'id', 'bigint', 2);
CALL Pro_Temp_ColumnWork('auth_warehouse_user', 'id', 'bigint', 2);
CALL Pro_Temp_ColumnWork('auth_space', 'id', 'bigint', 2);
CALL Pro_Temp_ColumnWork('pur_apply', 'billType', 'varchar(255)', 2);
CREATE TABLE IF NOT EXISTS `inv_place_order`
(
`id` int NOT NULL AUTO_INCREMENT,

Loading…
Cancel
Save