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

扫码修改

Browse Source
dev_unify
yewj 5 months ago
parent f31b78522c
commit 6ce5cdc9c1
4 changed files with 315 additions and 293 deletions
Show Stats Download Patch File Download Diff File

20
src/main/java/com/glxp/api/controller/collect/RelCodeBatchController.java
Unescape Escape View File

@ -33,6 +33,7 @@ public class RelCodeBatchController extends BaseController {
/**
* 上传文件保存
*
* @param uuid
* @param file
* @return
@ -40,31 +41,33 @@ public class RelCodeBatchController extends BaseController {
@RepeatSubmit()
@CusRedissonAnnotation(cacheName = RedissonCacheKey.XML_UPLOAD, key = {"#uuid"}, timeOutMsg = "系统正在处理，请勿重复上传")
@PostMapping("/udiwms/relCode/batch/xmlUpload")
public BaseResponse xmlUpload(@RequestParam("uuid") String uuid,@RequestParam("file") MultipartFile file) {
public BaseResponse xmlUpload(@RequestParam("uuid") String uuid, @RequestParam("file") MultipartFile file) {
relCodeBatchService.xmlUpload(file);
return ResultVOUtils.successMsg("上传成功！");
}
/**
* 手动添加
*
* @param relCodeBatchRequest
* @return
*/
@RepeatSubmit()
@PostMapping("/udiwms/relCode/batch/add")
public BaseResponse add(@RequestBody @Valid RelCodeBatchRequest relCodeBatchRequest,BindingResult bindingResult) {
public BaseResponse add(@RequestBody @Valid RelCodeBatchRequest relCodeBatchRequest, BindingResult bindingResult) {
relCodeBatchService.add(relCodeBatchRequest);
return ResultVOUtils.successMsg("添加成功！");
}
/**
* 添加拼箱
*
* @param relCodeBatchRequest
* @return
*/
@RepeatSubmit()
@PostMapping("/udiwms/relCode/batch/addRelCodeSpellBox")
public BaseResponse addRelCodeSpellBox(@RequestBody @Valid List<RelCodeBatchRequest> relCodeBatchRequest,BindingResult bindingResult) {
public BaseResponse addRelCodeSpellBox(@RequestBody @Valid List<RelCodeBatchRequest> relCodeBatchRequest, BindingResult bindingResult) {
relCodeBatchService.addRelCodeSpellBox(relCodeBatchRequest);
return ResultVOUtils.successMsg("添加成功！");
}
@ -99,7 +102,6 @@ public class RelCodeBatchController extends BaseController {
}
@GetMapping("/udiwms/relCode/batch/deleteDetail")
public BaseResponse deleteDetail(@RequestParam("curCode") String curCode) {
relCodeBatchService.deleteDetail(curCode);
@ -116,32 +118,34 @@ public class RelCodeBatchController extends BaseController {
/**
* 获取本地是否存在该层级码
*
* @param parentCode
* @return
*/
@GetMapping("/udiwms/relCode/batch/exist")
public BaseResponse batchExist(@RequestParam("parentCode") String parentCode) {
if (StrUtil.isBlank(parentCode)) return ResultVOUtils.error(500,"层级编码格式错误!");
if (StrUtil.isBlank(parentCode)) return ResultVOUtils.error(500, "层级编码格式错误!");
return ResultVOUtils.success(relCodeBatchService.batchExist(parentCode));
}
@GetMapping("/udiwms/relCode/detailByParentCode")
public BaseResponse detailByParentCode(@RequestParam("parentCode") String parentCode) {
if (StrUtil.isBlank(parentCode)) return ResultVOUtils.error(500,"层级编码格式错误!");
List<RelCodeDetailByParentCodeResponse> list = relCodeBatchService.detailByParentCodeSpms(parentCode,1);
if (StrUtil.isBlank(parentCode)) return ResultVOUtils.error(500, "层级编码格式错误!");
List<RelCodeDetailByParentCodeResponse> list = relCodeBatchService.detailByParentCodeSpms(parentCode, 1);
return ResultVOUtils.success(list);
}
/**
* 更新明细
*
* @param parentCode
* @return
*/
@GetMapping("/udiwms/relCode/updateIoCodeTempEntity")
public BaseResponse threadUpdateIoCodeTempEntity(@RequestParam("parentCode") String parentCode) {
if (StrUtil.isBlank(parentCode)) return ResultVOUtils.error(500,"层级编码格式错误!");
if (StrUtil.isBlank(parentCode)) return ResultVOUtils.error(500, "层级编码格式错误!");
relCodeBatchService.threadUpdateIoCodeTempEntity(parentCode);
return ResultVOUtils.success();
}

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

@ -1406,7 +1406,7 @@ public class IoCodeTempController extends BaseController {
// return ResultVOUtils.error(500, "当前库存不足，不允许0库存出库");
// }
} else {
int count = invProductDetailService.vailStockCount(codeTempEntity.getRelId(), codeTempEntity.getBatchNo(), codeTempEntity.getSupId(), codeTempEntity.getDeptCode(), codeTempEntity.getInvCode(), null,false);
int count = invProductDetailService.vailStockCount(codeTempEntity.getRelId(), codeTempEntity.getBatchNo(), codeTempEntity.getSupId(), codeTempEntity.getDeptCode(), codeTempEntity.getInvCode(), null, false);
if (count <= 0) {
if (count == -1) {

3
src/main/java/com/glxp/api/res/inout/IoCodeTempResponse.java
Unescape Escape View File

@ -1,6 +1,7 @@
package com.glxp.api.res.inout;
import com.baomidou.mybatisplus.annotation.TableField;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
@ -10,7 +11,7 @@ import java.util.Date;
*/
@Data
public class IoCodeTempResponse {
@ApiModelProperty(value = "单据ID主键")
private Integer id;
/**

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

@ -67,6 +67,8 @@
basic_products.mjfs,
basic_products.categoryName,
basic_products.cphhhbh,
basic_products.bhltcjsl,
basic_products.bhsycjsl,
basic_products.bzgg
FROM basic_udirel
inner JOIN basic_products
@ -192,6 +194,8 @@
basic_products.hchzsb,
basic_products.cpdls,
basic_products.price,
basic_products.bhltcjsl,
basic_products.bhsycjsl,
basic_products.basicPrductRemak1,
basic_products.basicPrductRemak2,
basic_products.basicPrductRemak3,
@ -328,6 +332,8 @@
basic_products.syqsfxyjxmj,
basic_products.mjfs,
basic_products.categoryName,
basic_products.bhltcjsl,
basic_products.bhsycjsl,
basic_products.cphhhbh,
company_product_relevance.unitFk,
basic_corp.name companyName
@ -485,6 +491,8 @@
basic_products.majorType,
basic_products.medicareType,
basic_products.workPlaceCount,
basic_products.bhltcjsl,
basic_products.bhsycjsl,
th.hsmc hslbName
FROM basic_products
inner JOIN basic_udirel
@ -693,6 +701,8 @@
basic_products.sfwwjbz,
basic_products.syqsfxyjxmj,
basic_products.mjfs,
basic_products.bhltcjsl,
basic_products.bhsycjsl,
basic_products.categoryName,
basic_products.cphhhbh
FROM basic_products
@ -869,6 +879,8 @@
basic_products.sfwwjbz,
basic_products.syqsfxyjxmj,
basic_products.mjfs,
basic_products.bhltcjsl,
basic_products.bhsycjsl,
basic_products.categoryName,
basic_products.cphhhbh
from basic_udirel
@ -1065,7 +1077,7 @@
updateTime, modifyTime,
createUser,
updateUser,
remark, useExpireTime, dispatch, groupBuy, needCert,isStack)
remark, useExpireTime, dispatch, groupBuy, needCert, isStack)
values (#{id},
#{uuid},
#{mainId},
@ -1088,7 +1100,7 @@
#{modifyTime},
#{createUser},
#{updateUser},
#{remark}, #{useExpireTime}, #{dispatch}, #{groupBuy}, #{needCert},#{isStack})
#{remark}, #{useExpireTime}, #{dispatch}, #{groupBuy}, #{needCert}, #{isStack})
</insert>
<delete id="deleteById" parameterType="Map">
@ -1275,7 +1287,7 @@
updateTime, modifyTime,
createUser,
updateUser,
remark, useExpireTime, dispatch, groupBuy, needCert,isStack)
remark, useExpireTime, dispatch, groupBuy, needCert, isStack)
values
<foreach collection="udiRelevanceEntities" item="item" index="index" separator=",">
@ -1301,7 +1313,8 @@
#{item.modifyTime},
#{item.createUser},
#{item.updateUser},
#{item.remark}, #{item.useExpireTime}, #{item.dispatch}, #{item.groupBuy}, #{item.needCert},#{item.isStack})
#{item.remark}, #{item.useExpireTime}, #{item.dispatch}, #{item.groupBuy}, #{item.needCert},
#{item.isStack})
</foreach>
</insert>
@ -1366,6 +1379,8 @@
basic_products.sfwwjbz,
basic_products.syqsfxyjxmj,
basic_products.mjfs,
basic_products.bhltcjsl,
basic_products.bhsycjsl,
basic_products.categoryName,
basic_products.cphhhbh
FROM basic_udirel
@ -1487,6 +1502,8 @@
basic_products.mjfs,
basic_products.categoryName,
basic_products.requireScanCode,
basic_products.bhltcjsl,
basic_products.bhsycjsl,
company_product_relevance.unitFk,
basic_corp.name companyName,
basic_products.cphhhbh

Write Preview
Loading…
Cancel
Save