接收第三方单据上传

fengcang
anthonyywj2 3 years ago
parent 97edaf03b4
commit 4efeb8af1f

@ -141,4 +141,7 @@ public class ConstantStatus {
public static final int SYNC_STATUS_SUCCESS = 1; //处理成功
public static final int SYNC_STATUS_FAIL = 2; //处理失败
public static final int SYNC_STATUS_WAIT = 0; //等待处理
public static final int THIRD_ORDER_UPLOAD = 1; //业务单据上传至第三方
public static final int THIRD_ORDER_RECEIVE = 2; //接收第三方上传扫码单据
}

@ -1,18 +1,20 @@
package com.glxp.api.admin.controller.thrsys;
import cn.hutool.core.collection.CollUtil;
import com.glxp.api.admin.annotation.AuthRuleAnnotation;
import com.glxp.api.admin.dao.basic.UdiRelevanceDao;
import com.glxp.api.admin.dao.basic.UnitMaintainDao;
import com.glxp.api.admin.dao.inventory.InvWarehouseDao;
import com.glxp.api.admin.entity.basic.BussinessOriginTypeEntity;
import com.glxp.api.admin.entity.basic.BussinessTypeEntity;
import com.glxp.api.admin.entity.basic.UnitMaintainEntity;
import com.glxp.api.admin.entity.basic.*;
import com.glxp.api.admin.entity.inventory.InvWarehouseEntity;
import com.glxp.api.admin.entity.thrsys.ThrPostOrderRequest;
import com.glxp.api.admin.req.inout.AddOrderRequest;
import com.glxp.api.admin.req.inout.PostOrderRequest;
import com.glxp.api.admin.res.basic.BussinessOriginTypeResponse;
import com.glxp.api.admin.service.basic.BussinessOriginTypeService;
import com.glxp.api.admin.service.basic.UdiRelevanceService;
import com.glxp.api.admin.service.basic.UnitMaintainService;
import com.glxp.api.admin.util.FilterUdiUtils;
import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils;
import org.springframework.web.bind.annotation.PostMapping;
@ -20,6 +22,7 @@ import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import java.util.List;
@RestController
public class ThrScOrderController {
@ -30,20 +33,47 @@ public class ThrScOrderController {
UnitMaintainDao unitMaintainDao;
@Resource
InvWarehouseDao invWarehouseDao;
@Resource
UdiRelevanceService udiRelevanceService;
@Resource
UdiRelevanceDao udiRelevanceDao;
@AuthRuleAnnotation("")
@PostMapping("udiwms/inout/thridOrder/upload")
public BaseResponse saveOrderWeb(@RequestBody ThrPostOrderRequest thrPostOrderRequest) {
// BussinessTypeEntity bussinessTypeEntity = bussinessOriginTypeService.findSysByAction(thrPostOrderRequest.getBillType(), thrPostOrderRequest.getThirdIdSys());
}
public String processOrder(ThrPostOrderRequest thrPostOrderRequest) {
BussinessOriginTypeResponse bussinessOriginTypeEntity = bussinessOriginTypeService.finByThirdAction(thrPostOrderRequest.getBillType());
UnitMaintainEntity unitMaintainEntity = unitMaintainDao.selectByThirdSys(thrPostOrderRequest.getThirdIdSys(), thrPostOrderRequest.getFromCorpId());
InvWarehouseEntity invWarehouseEntity = invWarehouseDao.selectByThirdSys(thrPostOrderRequest.getThirdIdSys(), thrPostOrderRequest.getInvCode());
List<ThrPostOrderRequest.CodeDetailEntity> codeDetailEntityList = thrPostOrderRequest.getItems();
if (CollUtil.isEmpty(codeDetailEntityList)) {
return "单据条码不能为空!";
}
for (ThrPostOrderRequest.CodeDetailEntity codeDetailEntity : codeDetailEntityList) {
UdiEntity udiEntity = FilterUdiUtils.getUdi(codeDetailEntity.getCode());
if (udiEntity == null) {
return codeDetailEntity.getCode() + "UDI码格式错误";
}
UdiRelevanceEntity udiRelevanceEntity = udiRelevanceDao.selectByDiThirdId(udiEntity.getUdi(), codeDetailEntity.getProductCode(), thrPostOrderRequest.getThirdIdSys());
if (udiRelevanceEntity == null) {
return "该物资编码:" + codeDetailEntity.getProductCode() + "未与UDI码" + udiEntity.getUdi() + "做关联对照";
}
}
PostOrderRequest postOrderRequest = new PostOrderRequest();
return ResultVOUtils.success("上传成功!");
return null;
}
}

@ -13,6 +13,10 @@ public interface UdiRelevanceDao {
List<UdiRelevanceResponse> filterUdiRelevance(FilterUdiInfoRequest filterUdiInfoRequest);
UdiRelevanceEntity selectByDiThirdId(String nameCode, String thirdId, String thirdSys);
List<UdiRelevanceResponse> filterUdiJoinSup(FilterUdiInfoRequest filterUdiInfoRequest);

@ -30,6 +30,7 @@ public class StockOrderEntity {
private String locStorageCode;
private String invWarehouseCode;
private String fromSubInvCode;
private String fromSubInvName;
//补单单号
private String supplementNo;

@ -47,4 +47,8 @@ public class StockOrderUploadLogEntity {
*/
private String result;
private String billTypeName;
private Integer fromType;
}

@ -18,10 +18,10 @@ public class ThrPostOrderRequest {
private String actorId; //单据创建人ID
private String invCode; //当前所在仓库号
private String invName; //当前所在仓库名称
private String subInvCode; //当前所在分库
private String subInvCode; //当前所在分库编码
private String subInvName; //当前所在分库名称
private String status; //单据状态
private List<CodeDetailEntity> codeArray;
private List<CodeDetailEntity> items;
@Data
public static class CodeDetailEntity {
@ -33,6 +33,6 @@ public class ThrPostOrderRequest {
private Integer count; //扫码数量
private String supId; //供应商ID
private String supName; //供应商名称
private String productCode; //物资编码
}
}

@ -31,4 +31,6 @@ public class StockOrderUploadLogRequest extends ListPageRequest {
*/
private Integer status;
private Integer fromType;
}

@ -314,6 +314,7 @@ public class StockOrderServiceImpl implements StockOrderService {
uploadLog.setBillType(stockOrderEntity.getBillType());
uploadLog.setSubmitTime(new Date());
uploadLog.setBillNo(udiwmsOrderRequest.getBillNo());
uploadLog.setFromType(ConstantStatus.THIRD_ORDER_UPLOAD);
BasicThirdSysEntity basicThirdSysEntity = basicThirdSysDao.selectByThirdId(thirdSysBusApiEntity.getThirdSys());
String response = httpOkClient.uCloudPost(basicThirdSysEntity.getThridUrl() + "/udiwms/erp/submitOrders", udiwmsOrderRequest);

@ -56,12 +56,12 @@ public class StockOrderUploadLogServiceImpl implements StockOrderUploadLogServic
PageHelper.offsetPage(offset, request.getLimit());
}
List<StockOrderUploadLogEntity> list = stockOrderUploadLogMapper.selectList(request);
if (CollUtil.isNotEmpty(list)) {
for (StockOrderUploadLogEntity uploadLog : list) {
BussinessLocalTypeEntity localTypeEntity = bussinessLocalTypeService.findBTByAction(uploadLog.getBillType());
uploadLog.setBillType(localTypeEntity.getName());
}
}
// if (CollUtil.isNotEmpty(list)) {
// for (StockOrderUploadLogEntity uploadLog : list) {
// BussinessLocalTypeEntity localTypeEntity = bussinessLocalTypeService.findBTByAction(uploadLog.getBillType());
// uploadLog.setBillType(localTypeEntity.getName());
// }
// }
return list;
}

@ -360,6 +360,22 @@
limit 1
</select>
<select id="selectByDiThirdId" parameterType="com.glxp.api.admin.req.basic.FilterUdiInfoRequest"
resultType="com.glxp.api.admin.entity.basic.UdiRelevanceEntity">
select * FROM basic_udirel
<where>
<if test="thirdId != '' and thirdId != null">
AND ${thirdSys} = #{thirdId}
</if>
<if test="nameCode != '' and nameCode != null">
AND nameCode = #{nameCode}
</if>
</where>
limit 1
</select>
<select id="filterEntity" parameterType="com.glxp.api.admin.req.basic.FilterUdiInfoRequest"
resultType="com.glxp.api.admin.entity.basic.UdiRelevanceEntity">
select * FROM basic_udirel

@ -105,10 +105,13 @@
<select id="filterListOr" parameterType="com.glxp.api.admin.req.business.StockOrderFilterRequest"
resultType="com.glxp.api.admin.entity.business.StockOrderEntity">
SELECT stock_order.* ,inv_warehouse.name invName, inv_warehouse_sub.name subInvName ,basic_bustype_local.name billTypeName FROM stock_order
SELECT stock_order.* ,inv_warehouse.name invName, iws.name subInvName ,basic_bustype_local.name
billTypeName,iws2.name fromSubInvName FROM stock_order
left join basic_bustype_local on stock_order.billType = basic_bustype_local.action
LEFT JOIN inv_warehouse ON stock_order.locStorageCode = inv_warehouse.`code`
LEFT JOIN inv_warehouse_sub ON inv_warehouse_sub.parentId = inv_warehouse.`code`
LEFT JOIN inv_warehouse_sub ON stock_order.locStorageCode = inv_warehouse.`code`
LEFT JOIN inv_warehouse_sub iws ON stock_order.invWarehouseCode = iws.`code`
LEFT JOIN inv_warehouse_sub iws2 ON stock_order.fromSubInvCode = iws2.`code`
LEFT JOIN inv_warehouse_user on inv_warehouse_sub.code = inv_warehouse_user.`code`
<where>
<if test="id != '' and id!=null">

@ -4,14 +4,14 @@
<resultMap id="BaseResultMap" type="com.glxp.api.admin.entity.business.StockOrderUploadLogEntity">
<!--@mbg.generated-->
<!--@Table stock_order_upload_log-->
<id column="id" jdbcType="INTEGER" property="id" />
<result column="billNo" jdbcType="VARCHAR" property="billNo" />
<result column="billDate" jdbcType="TIMESTAMP" property="billDate" />
<result column="billType" jdbcType="VARCHAR" property="billType" />
<result column="thrBillNo" jdbcType="VARCHAR" property="thrBillNo" />
<result column="submitTime" jdbcType="TIMESTAMP" property="submitTime" />
<result column="status" jdbcType="INTEGER" property="status" />
<result column="result" jdbcType="VARCHAR" property="result" />
<id column="id" jdbcType="INTEGER" property="id"/>
<result column="billNo" jdbcType="VARCHAR" property="billNo"/>
<result column="billDate" jdbcType="TIMESTAMP" property="billDate"/>
<result column="billType" jdbcType="VARCHAR" property="billType"/>
<result column="thrBillNo" jdbcType="VARCHAR" property="thrBillNo"/>
<result column="submitTime" jdbcType="TIMESTAMP" property="submitTime"/>
<result column="status" jdbcType="INTEGER" property="status"/>
<result column="result" jdbcType="VARCHAR" property="result"/>
</resultMap>
<sql id="Base_Column_List">
<!--@mbg.generated-->
@ -20,7 +20,7 @@
<select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
<!--@mbg.generated-->
select
<include refid="Base_Column_List" />
<include refid="Base_Column_List"/>
from stock_order_upload_log
where id = #{id,jdbcType=INTEGER}
</select>
@ -29,16 +29,18 @@
delete from stock_order_upload_log
where id = #{id,jdbcType=INTEGER}
</delete>
<insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.glxp.api.admin.entity.business.StockOrderUploadLogEntity" useGeneratedKeys="true">
<insert id="insert" keyColumn="id" keyProperty="id"
parameterType="com.glxp.api.admin.entity.business.StockOrderUploadLogEntity" useGeneratedKeys="true">
<!--@mbg.generated-->
insert into stock_order_upload_log (billNo, billDate, billType,
thrBillNo, submitTime, `status`,
`result`)
`result`,fromType)
values (#{billNo,jdbcType=VARCHAR}, #{billDate,jdbcType=TIMESTAMP}, #{billType,jdbcType=VARCHAR},
#{thrBillNo,jdbcType=VARCHAR}, #{submitTime,jdbcType=TIMESTAMP}, #{status,jdbcType=INTEGER},
#{result,jdbcType=VARCHAR})
#{result,jdbcType=VARCHAR},#{fromType})
</insert>
<insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.glxp.api.admin.entity.business.StockOrderUploadLogEntity" useGeneratedKeys="true">
<insert id="insertSelective" keyColumn="id" keyProperty="id"
parameterType="com.glxp.api.admin.entity.business.StockOrderUploadLogEntity" useGeneratedKeys="true">
<!--@mbg.generated-->
insert into stock_order_upload_log
<trim prefix="(" suffix=")" suffixOverrides=",">
@ -63,6 +65,10 @@
<if test="result != null">
`result`,
</if>
<if test="fromType != null">
`fromType`,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="billNo != null">
@ -86,9 +92,14 @@
<if test="result != null">
#{result,jdbcType=VARCHAR},
</if>
<if test="fromType != null">
`fromType`,
</if>
</trim>
</insert>
<update id="updateByPrimaryKeySelective" parameterType="com.glxp.api.admin.entity.business.StockOrderUploadLogEntity">
<update id="updateByPrimaryKeySelective"
parameterType="com.glxp.api.admin.entity.business.StockOrderUploadLogEntity">
<!--@mbg.generated-->
update stock_order_upload_log
<set>
@ -113,6 +124,10 @@
<if test="result != null">
`result` = #{result,jdbcType=VARCHAR},
</if>
<if test="fromType != null">
`fromType` = #{fromType},
</if>
</set>
where id = #{id,jdbcType=INTEGER}
</update>
@ -125,12 +140,17 @@
thrBillNo = #{thrBillNo,jdbcType=VARCHAR},
submitTime = #{submitTime,jdbcType=TIMESTAMP},
`status` = #{status,jdbcType=INTEGER},
`fromType` = #{fromType,jdbcType=INTEGER},
`result` = #{result,jdbcType=VARCHAR}
where id = #{id,jdbcType=INTEGER}
</update>
<select id="selectList" resultMap="BaseResultMap">
select * from stock_order_upload_log
<select id="selectList"
parameterType="com.glxp.api.admin.req.business.StockOrderUploadRequest"
resultType="com.glxp.api.admin.entity.business.StockOrderUploadLogEntity">
select stock_order_upload_log.*,basic_bustype_local.name billTypeName from stock_order_upload_log
LEFT JOIN basic_bustype_local on
stock_order_upload_log.billType = basic_bustype_local.action
<where>
<if test="billNo != null and billNo != ''">
AND billNo = #{billNo}
@ -144,7 +164,12 @@
<if test="submitTime != null">
AND submitTime = date_format(#{submitTime},'%Y-%m-%d')
</if>
<if test="fromType != null">
AND fromType = #{fromType}
</if>
</where>
group by stock_order_upload_log.id
order by submitTime desc
</select>

@ -191,9 +191,10 @@
<select id="filterListOr" parameterType="com.glxp.api.admin.req.inout.OrderFilterRequest"
resultType="com.glxp.api.admin.entity.inout.OrderEntity">
SELECT io_order.* ,inv_warehouse.name invName, inv_warehouse_sub.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`
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`
<where>

Loading…
Cancel
Save