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

feat: 保存代码

Browse Source
dev_20240306
chenhc 2 years ago
parent c3c232ccf8
commit 9b652cd815
6 changed files with 24 additions and 17 deletions
Show Stats Download Patch File Download Diff File

2
src/main/java/com/glxp/api/entity/thrsys/ThrInvOrderDetail.java
Unescape Escape View File

@ -53,7 +53,7 @@ public class ThrInvOrderDetail implements Serializable {
/**
* 批次号
*/
private Long batchNo;
private String batchNo;
/**
* 计量单位

4
src/main/java/com/glxp/api/http/ErpInvClient.java
Unescape Escape View File

@ -80,13 +80,13 @@ public class ErpInvClient {
public BaseResponse<PageSimpleResponse<ThrInvResultResponse>> getInvResult(FilterInvProductRequest invProductRequest) {
ThrSystemEntity basicThirdSysEntity = basicThirdSysService.selectByThirdId(invProductRequest.getThirdSys());
String url = basicThirdSysEntity.getThridUrl() + invProductRequest.getThirdSysUrlValue();
// String url = basicThirdSysEntity.getThridUrl() + invProductRequest.getThirdSysUrlValue();
String url = "http://192.168.0.166:9997/udiwms/erp/inv/getInvResult";
try {
String response = httpOkClient.uCloudPost(url, invProductRequest);
BaseResponse<PageSimpleResponse<ThrInvResultResponse>> listBaseResponse =
JSONObject.parseObject(response, new TypeReference<BaseResponse<PageSimpleResponse<ThrInvResultResponse>>>() {
});
return listBaseResponse;
} catch (Exception e) {
log.error("获取第三方库存明细异常", e);

11
src/main/java/com/glxp/api/service/thrsys/impl/ThrInvOrderServiceImpl.java
Unescape Escape View File

@ -154,7 +154,7 @@ public class ThrInvOrderServiceImpl implements ThrInvOrderService {
QueryWrapper<ThrInvOrder> qw = new QueryWrapper<>();
qw.eq("billNo", billNo);
ThrInvOrder thrInvOrder = thrInvOrderMapper.selectOne(qw);
if (Objects.isNull(thrInvOrder) || thrInvOrder.getStatus() != ConstantStatus.SFIO_DRAFT) return false;
if (Objects.isNull(thrInvOrder)) return false;
//通过单号获取单据明细信息
QueryWrapper<ThrInvOrderDetail> qwd = new QueryWrapper<>();
@ -176,7 +176,7 @@ public class ThrInvOrderServiceImpl implements ThrInvOrderService {
ioOrderEntity.setDeptCode(thrInvOrder.getDeptCode());
ioOrderEntity.setAction(generateOrderRequest.getAction());
ioOrderEntity.setFromType(ConstantStatus.FROM_THRORDER);//网页新增
ioOrderEntity.setFromType(ConstantStatus.FROM_WEBNEW);//网页新增
ioOrderEntity.setStatus(ConstantStatus.ORDER_STATUS_TEMP_SAVE);//草稿
ioOrderEntity.setDealStatus(ConstantStatus.ORDER_DEAL_DRAFT);//草稿
ioOrderEntity.setCorpOrderId(billNo);//单据号
@ -260,6 +260,13 @@ public class ThrInvOrderServiceImpl implements ThrInvOrderService {
ioOrderDetailBizEntity.setBindRlFk(basicProductsEntity.getId());
ioOrderDetailBizEntity.setNameCode(basicProductsEntity.getNameCode());
ioOrderDetailBizEntity.setCount(Integer.valueOf(thrInvOrderDetail.getReCount()));
ioOrderDetailBizEntity.setBatchNo(thrInvOrderDetail.getBatchNo());
ioOrderDetailBizEntity.setCoName(basicProductsEntity.getCpmctymc());
ioOrderDetailBizEntity.setCertCode(basicProductsEntity.getZczbhhzbapzbh());
ioOrderDetailBizEntity.setManufacturer(basicProductsEntity.getManufactory());
ioOrderDetailBizEntity.setMeasname(basicProductsEntity.getMeasname());
ioOrderDetailBizEntity.setSpec(basicProductsEntity.getGgxh());
ioOrderDetailBizEntity.setPrice(thrInvOrderDetail.getPrice());
}
}

10
src/main/resources/mybatis/mapper/thrsys/ThrInvOrderDetailMapper.xml
Unescape Escape View File

@ -11,7 +11,7 @@
<result column="thrCode" jdbcType="VARCHAR" property="thrCode" />
<result column="nameCode" jdbcType="VARCHAR" property="nameCode" />
<result column="ggxh" jdbcType="VARCHAR" property="ggxh" />
<result column="batchNo" jdbcType="INTEGER" property="batchNo" />
<result column="batchNo" jdbcType="VARCHAR" property="batchNo" />
<result column="measname" jdbcType="VARCHAR" property="measname" />
<result column="price" jdbcType="DECIMAL" property="price" />
<result column="productionDate" jdbcType="TIMESTAMP" property="productionDate" />
@ -64,7 +64,7 @@
manufacturer, remark)
values (#{orderIdFk,jdbcType=VARCHAR}, #{cpmctymc,jdbcType=VARCHAR}, #{relId,jdbcType=INTEGER},
#{thrCode,jdbcType=VARCHAR}, #{nameCode,jdbcType=VARCHAR}, #{ggxh,jdbcType=VARCHAR},
#{batchNo,jdbcType=INTEGER}, #{measname,jdbcType=VARCHAR}, #{price,jdbcType=DECIMAL},
#{batchNo,jdbcType=VARCHAR}, #{measname,jdbcType=VARCHAR}, #{price,jdbcType=DECIMAL},
#{productionDate,jdbcType=TIMESTAMP}, #{expireDate,jdbcType=TIMESTAMP}, #{ylqxzcrbarmc,jdbcType=VARCHAR},
#{zczbhhzbapzbh,jdbcType=VARCHAR}, #{inCount,jdbcType=VARCHAR}, #{outCount,jdbcType=VARCHAR},
#{supName,jdbcType=VARCHAR}, #{deptName,jdbcType=VARCHAR}, #{deptCode,jdbcType=VARCHAR},
@ -175,7 +175,7 @@
#{ggxh,jdbcType=VARCHAR},
</if>
<if test="batchNo != null">
#{batchNo,jdbcType=INTEGER},
#{batchNo,jdbcType=VARCHAR},
</if>
<if test="measname != null">
#{measname,jdbcType=VARCHAR},
@ -259,7 +259,7 @@
ggxh = #{ggxh,jdbcType=VARCHAR},
</if>
<if test="batchNo != null">
batchNo = #{batchNo,jdbcType=INTEGER},
batchNo = #{batchNo,jdbcType=VARCHAR},
</if>
<if test="measname != null">
measname = #{measname,jdbcType=VARCHAR},
@ -330,7 +330,7 @@
thrCode = #{thrCode,jdbcType=VARCHAR},
nameCode = #{nameCode,jdbcType=VARCHAR},
ggxh = #{ggxh,jdbcType=VARCHAR},
batchNo = #{batchNo,jdbcType=INTEGER},
batchNo = #{batchNo,jdbcType=VARCHAR},
measname = #{measname,jdbcType=VARCHAR},
price = #{price,jdbcType=DECIMAL},
productionDate = #{productionDate,jdbcType=TIMESTAMP},

2
src/main/resources/mybatis/mapper/thrsys/ThrInvOrderMapper.xml
Unescape Escape View File

@ -260,6 +260,6 @@
]]>
</if>
</where>
ORDER BY thr_inv_order.billNo DESC
ORDER BY thr_inv_order.billdate DESC
</select>
</mapper>

12
src/main/resources/schemas/schema_v2.4.sql
Unescape Escape View File

@ -511,13 +511,13 @@ INSERT ignore INTO basic_product_set(`id`, `parmName`, `parmKey`, `enable`, `sup
`sort`, `localEdit`)
VALUES (33, '采购类型', 'purType', 1, 1, 1, 0, '采购类型是否必填字段', 65, 1);
INSERT INTO `udi_wms_ct`.`sys_param_config`(`id`, `parentId`, `paramName`, `paramKey`, `paramValue`, `paramStatus`, `paramType`, `paramExplain`, `updateTime`)
INSERT ignore INTO sys_param_config(`id`, `parentId`, `paramName`, `paramKey`, `paramValue`, `paramStatus`, `paramType`, `paramExplain`, `updateTime`)
VALUES (20099, 0, '三方出入库明细是否组套', 'inv_set_enable', '0', 1, 0, '0：否；1：是', '2023-12-26 09:26:38');
-- ----------------------------
-- Table structure for thr_inv_order
-- ----------------------------
CREATE TABLE `thr_inv_order` (
CREATE TABLE IF NOT EXISTS `thr_inv_order` (
`id` int(0) NOT NULL AUTO_INCREMENT,
`billNo` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '单据号',
`billDate` datetime(0) NULL DEFAULT NULL COMMENT '单据时间',
@ -541,7 +541,7 @@ CREATE TABLE `thr_inv_order` (
-- ----------------------------
-- Table structure for thr_inv_order_detail
-- ----------------------------
CREATE TABLE `thr_inv_order_detail` (
CREATE TABLE IF NOT EXISTS `thr_inv_order_detail` (
`id` int(0) NOT NULL AUTO_INCREMENT,
`orderIdFk` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '单据号',
`cpmctymc` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '产品通用名称',
@ -549,7 +549,7 @@ CREATE TABLE `thr_inv_order_detail` (
`thrCode` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '第三方项目编码/耗材字典',
`nameCode` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT 'DI',
`ggxh` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '规格型号',
`batchNo` int(0) NULL DEFAULT NULL COMMENT '批次号',
`batchNo` varchar(60) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '批次号',
`measname` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '计量单位',
`price` decimal(10, 2) NULL DEFAULT NULL COMMENT '价格',
`productionDate` datetime(0) NULL DEFAULT NULL COMMENT '生产日期',
@ -572,7 +572,7 @@ CREATE TABLE `thr_inv_order_detail` (
PRIMARY KEY (`id`) USING BTREE
) ENGINE = InnoDB AUTO_INCREMENT = 121 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci ROW_FORMAT = Dynamic;
INSERT INTO auth_menu(`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query_param`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`)
INSERT ignore INTO auth_menu(`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query_param`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`)
VALUES (2086, '出入库明细', 1608, 8, 'thrInvOrder', NULL, NULL, 1, 0, 'M', '0', '0', NULL, '', '超级用户', '2024-02-28 11:47:10', NULL, NULL, NULL);
INSERT INTO auth_menu(`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query_param`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`)
INSERT ignore INTO auth_menu(`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query_param`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`)
VALUES (2087, '出入库查询', 2086, 1, 'thirdSys/invOrder/thrInvOrder', 'thirdSys/invOrder/thrInvOrder', NULL, 1, 0, 'C', '0', '0', 'thirdSys:invOrder:thrInvOrder', NULL, '超级用户', '2024-02-28 11:51:21', NULL, NULL, NULL);

Write Preview
Loading…
Cancel
Save