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

1.新增单据添加分仓参数校验

Browse Source 
2.委托验收响应结果添加分仓字段显示，添加相关查询方法
fencang
x_z 3 years ago
parent 626710d87f
commit ef8863ca17
9 changed files with 80 additions and 21 deletions
Show Stats Download Patch File Download Diff File

10
api-admin/src/main/java/com/glxp/sale/admin/controller/basic/EntrustReceController.java
Unescape Escape View File

@ -1,7 +1,6 @@
package com.glxp.sale.admin.controller.basic;
//委托验收
import cn.hutool.core.collection.CollUtil;
import com.github.pagehelper.PageInfo;
import com.glxp.sale.admin.entity.basic.BussinessTypeEntity;
import com.glxp.sale.admin.entity.basic.DlEntrustReceEntity;
@ -10,7 +9,7 @@ import com.glxp.sale.admin.req.basic.BasicEntrustRecRequest;
import com.glxp.sale.admin.req.basic.BussinessTypeFilterRequest;
import com.glxp.sale.admin.req.info.DeleteRequest;
import com.glxp.sale.admin.res.PageSimpleResponse;
import com.glxp.sale.admin.res.basic.EntrustReceRespose;
import com.glxp.sale.admin.res.basic.EntrustReceResponse;
import com.glxp.sale.admin.service.auth.CustomerService;
import com.glxp.sale.admin.service.basic.BussinessTypeService;
import com.glxp.sale.admin.service.basic.EntrustReceService;
@ -22,7 +21,6 @@ import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@ -39,10 +37,10 @@ public class EntrustReceController {
@GetMapping("/spms/entrust/rece/filter")
public BaseResponse getEntrustRece(BasicEntrustRecRequest basicExportStatusRequest) {
List<EntrustReceRespose> entrustReceEntities = entrustReceService.filterJoinEntrustRec(basicExportStatusRequest);
PageInfo<EntrustReceRespose> pageInfo;
List<EntrustReceResponse> entrustReceEntities = entrustReceService.filterJoinEntrustRec(basicExportStatusRequest);
PageInfo<EntrustReceResponse> pageInfo;
pageInfo = new PageInfo<>(entrustReceEntities);
PageSimpleResponse<EntrustReceRespose> pageSimpleResponse = new PageSimpleResponse<>();
PageSimpleResponse<EntrustReceResponse> pageSimpleResponse = new PageSimpleResponse<>();
pageSimpleResponse.setTotal(pageInfo.getTotal());
pageSimpleResponse.setList(entrustReceEntities);
return ResultVOUtils.success(pageSimpleResponse);

6
api-admin/src/main/java/com/glxp/sale/admin/controller/inout/WareHouseController.java
Unescape Escape View File

@ -278,9 +278,13 @@ public class WareHouseController {
@AuthRuleAnnotation("")
@GetMapping("warehouse/inout/submitOrderWeb")
public BaseResponse submitOrderWeb(AddOrderRequest orderEntity) {
if (null != orderEntity) {
if (StrUtil.isBlank(orderEntity.getInvWarehouseCode())) {
return ResultVOUtils.error(500, "分仓未选择");
}
}
orderService.updateOrderStatus(orderEntity.getOrderId(), ConstantStatus.ORDER_STATUS_PROCESS);
return saveOrderWeb(orderEntity);
// return ResultVOUtils.success();
}
@AuthRuleAnnotation("")

5
api-admin/src/main/java/com/glxp/sale/admin/dao/basic/EntrustReceDao.java
Unescape Escape View File

@ -1,10 +1,9 @@
package com.glxp.sale.admin.dao.basic;
import cn.hutool.core.collection.CollUtil;
import com.glxp.sale.admin.entity.basic.DlEntrustReceEntity;
import com.glxp.sale.admin.entity.basic.EntrustReceEntity;
import com.glxp.sale.admin.req.basic.BasicEntrustRecRequest;
import com.glxp.sale.admin.res.basic.EntrustReceRespose;
import com.glxp.sale.admin.res.basic.EntrustReceResponse;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
@ -16,7 +15,7 @@ public interface EntrustReceDao {
List<DlEntrustReceEntity> downloadEntrustRec(BasicEntrustRecRequest basicEntrustRecRequest);
List<EntrustReceRespose> filterJoinEntrustRec(BasicEntrustRecRequest basicEntrustRecRequest);
List<EntrustReceResponse> filterJoinEntrustRec(BasicEntrustRecRequest basicEntrustRecRequest);
boolean insertEntrustRec(EntrustReceEntity ioOrderStatusEntity);

8
api-admin/src/main/java/com/glxp/sale/admin/dao/inventory/InvSubWarehouseDao.java
Unescape Escape View File

@ -36,4 +36,12 @@ public interface InvSubWarehouseDao {
* @return
*/
int countByParentIdAndName(@Param("parentId") String parentId, @Param("name") String name);
/**
* 根据编码查询名称
*
* @param code
* @return
*/
String selectNameByCode(@Param("code") String code);
}

37
api-admin/src/main/java/com/glxp/sale/admin/res/basic/EntrustReceRespose.java → api-admin/src/main/java/com/glxp/sale/admin/res/basic/EntrustReceResponse.java
Unescape Escape View File

@ -5,7 +5,7 @@ import lombok.Data;
import java.util.Date;
@Data
public class EntrustReceRespose {
public class EntrustReceResponse {
private Integer id;
private String action;
private String entrustInv;
@ -16,14 +16,47 @@ public class EntrustReceRespose {
private String remark;
private boolean finishRece;
private String curName;
private String entrustName;
/**
* 委托验收人
*/
private String employeeName;
/**
* 分库名称
*/
private String entrustInvName;
/**
* 当前仓库编码
*/
private String curInv;
private String curInvName;
/**
* 当前仓库名称
*/
private String curInvName;
/**
* 委托分库编码
*/
private String entrustSubInv;
/**
* 当前分库编码
*/
private String invWarehouseCode;
/**
* 当前分库名称
*/
private String invWarehouseName;
/**
* 委托分库名称
*/
private String entrustSubInvName;
}

6
api-admin/src/main/java/com/glxp/sale/admin/service/basic/EntrustReceService.java
Unescape Escape View File

@ -1,11 +1,9 @@
package com.glxp.sale.admin.service.basic;
import com.glxp.sale.admin.entity.basic.BasicExportStatusEntity;
import com.glxp.sale.admin.entity.basic.DlEntrustReceEntity;
import com.glxp.sale.admin.entity.basic.EntrustReceEntity;
import com.glxp.sale.admin.req.basic.BasicEntrustRecRequest;
import com.glxp.sale.admin.req.basic.BasicExportStatusRequest;
import com.glxp.sale.admin.res.basic.EntrustReceRespose;
import com.glxp.sale.admin.res.basic.EntrustReceResponse;
import java.util.List;
@ -17,7 +15,7 @@ public interface EntrustReceService {
List<DlEntrustReceEntity> downloadEntrustRec(BasicEntrustRecRequest basicEntrustRecRequest);
List<EntrustReceRespose> filterJoinEntrustRec(BasicEntrustRecRequest basicEntrustRecRequest);
List<EntrustReceResponse> filterJoinEntrustRec(BasicEntrustRecRequest basicEntrustRecRequest);
boolean insertEntrustRec(EntrustReceEntity entrustReceEntity);

21
api-admin/src/main/java/com/glxp/sale/admin/service/basic/impl/EntrustReceServiceImpl.java
Unescape Escape View File

@ -3,11 +3,11 @@ package com.glxp.sale.admin.service.basic.impl;
import cn.hutool.core.collection.CollUtil;
import com.github.pagehelper.PageHelper;
import com.glxp.sale.admin.dao.basic.EntrustReceDao;
import com.glxp.sale.admin.entity.basic.CorpImportLogEntity;
import com.glxp.sale.admin.dao.inventory.InvSubWarehouseDao;
import com.glxp.sale.admin.entity.basic.DlEntrustReceEntity;
import com.glxp.sale.admin.entity.basic.EntrustReceEntity;
import com.glxp.sale.admin.req.basic.BasicEntrustRecRequest;
import com.glxp.sale.admin.res.basic.EntrustReceRespose;
import com.glxp.sale.admin.res.basic.EntrustReceResponse;
import com.glxp.sale.admin.service.basic.EntrustReceService;
import org.springframework.stereotype.Service;
@ -20,6 +20,8 @@ public class EntrustReceServiceImpl implements EntrustReceService {
@Resource
EntrustReceDao entrustReceDao;
@Resource
private InvSubWarehouseDao invSubWarehouseDao;
@Override
public EntrustReceEntity findById(Integer id) {
@ -58,7 +60,7 @@ public class EntrustReceServiceImpl implements EntrustReceService {
}
@Override
public List<EntrustReceRespose> filterJoinEntrustRec(BasicEntrustRecRequest basicEntrustRecRequest) {
public List<EntrustReceResponse> filterJoinEntrustRec(BasicEntrustRecRequest basicEntrustRecRequest) {
if (basicEntrustRecRequest == null) {
return Collections.emptyList();
@ -67,7 +69,18 @@ public class EntrustReceServiceImpl implements EntrustReceService {
int offset = (basicEntrustRecRequest.getPage() - 1) * basicEntrustRecRequest.getLimit();
PageHelper.offsetPage(offset, basicEntrustRecRequest.getLimit());
}
return entrustReceDao.filterJoinEntrustRec(basicEntrustRecRequest);
List<EntrustReceResponse> entrustReceResponses = entrustReceDao.filterJoinEntrustRec(basicEntrustRecRequest);
if (CollUtil.isNotEmpty(entrustReceResponses)) {
//查询当前分库名称和委托验收分库名称
entrustReceResponses.forEach(entrustReceResponse -> {
String invWarehouseName = invSubWarehouseDao.selectNameByCode(entrustReceResponse.getInvWarehouseCode());//查询当前分库名称
entrustReceResponse.setInvWarehouseName(invWarehouseName);
String entrustSubInvName = invSubWarehouseDao.selectNameByCode(entrustReceResponse.getEntrustSubInv());
entrustReceResponse.setEntrustSubInvName(entrustSubInvName);
});
}
return entrustReceResponses;
}
@Override

2
api-admin/src/main/resources/mybatis/mapper/basic/EntrustReceDao.xml
Unescape Escape View File

@ -65,7 +65,7 @@
<select id="filterJoinEntrustRec" parameterType="com.glxp.sale.admin.req.basic.BasicEntrustRecRequest"
resultType="com.glxp.sale.admin.res.basic.EntrustReceRespose">
resultType="com.glxp.sale.admin.res.basic.EntrustReceResponse">
select basic_entrust_accept.* ,
a.name curName, b.name entrustName,auth_user.employeeName
,c.name entrustInvName,d.name curInvName

6
api-admin/src/main/resources/mybatis/mapper/inventory/InvSubWarehouseDao.xml
Unescape Escape View File

@ -122,4 +122,10 @@
<select id="countByParentIdAndName" resultType="int">
select count(*) from inv_warehouse_sub where parentId = #{parentId} and name = #{name}
</select>
<select id="selectNameByCode" resultType="java.lang.String">
select name
from inv_warehouse_sub
where code = #{code}
</select>
</mapper>
Write Preview
Loading…
Cancel
Save