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

未验收单据，委托验收界面功能

Browse Source
master
anthonyywj2 3 years ago
parent 5a6be7ed07
commit 2f8a03ced1
8 changed files with 117 additions and 13 deletions

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

@ -233,12 +233,31 @@ public class OrderController {
BussinessTypeEntity bussinessTypeEntity = bussinessTypeService.findBTByAction(orderFilterRequest.getAction());
StockOrderEntity stockOrderEntity = stockOrderService.findByBillNo(orderFilterRequest.getOrderId());
if (stockOrderEntity == null || stockOrderEntity.getOrderIdFk() == null) {
return ResultVOUtils.error(500, "单据未找到！");
} else if (!bussinessTypeEntity.getLocalAction().equals(stockOrderEntity.getBillType())) {
return ResultVOUtils.error(500, "非" + bussinessTypeEntity.getName() + "类型单据！");
} else {
StockOrderFilterRequest stockOrderFilterRequest = new StockOrderFilterRequest();
orderFilterRequest.setId(stockOrderEntity.getOrderIdFk());
stockOrderFilterRequest.setUserId(customerService.getUserId());
// if (StrUtil.isNotEmpty(stockOrderFilterRequest.getLocStorageCode())) {
// InvWarehouseEntity invWarehouseEntity = invWarehouseService.selectByCode(stockOrderFilterRequest.getLocStorageCode());
// FilterInvUserRequest filterInvUserRequest = new FilterInvUserRequest();
// filterInvUserRequest.setCode(invWarehouseEntity.getCode());
// filterInvUserRequest.setUserid(userId.longValue());
// filterInvUserRequest.setIsDirector(true);
// List<WarehouseUserEntity> warehouseUserEntities = warehouseUserService.filterWarehouseUsers(filterInvUserRequest);
// if (CollUtil.isEmpty(warehouseUserEntities)) {
// stockOrderFilterRequest.setUnionUser(userId);
// }
// }
}
if (orderFilterRequest.getOrderId() == null || "".equals(orderFilterRequest.getOrderId())) {
orderFilterRequest.setId(null);
@ -247,8 +266,11 @@ public class OrderController {
if (orderEntity.getReceiveStatus() == ConstantStatus.RECEIVE_ED) {
return ResultVOUtils.error(500, "单据已验收！");
}
}
List<OrderEntity> orderEntityList;
if (orderFilterRequest.getStatus() == null || orderFilterRequest.getStatus() == 0) {
orderFilterRequest.setStatus(4);
@ -274,9 +296,14 @@ public class OrderController {
BindingResult bindingResult) {
AuthAdmin authAdmin = customerService.getUserBean();
long customerId = customerService.getCustomerId();
return updateReview(authAdmin, customerId, updateExportStatusRequest);
}
public BaseResponse updateReview(AuthAdmin authAdmin, long customerId, UpdateExportStatusRequest updateExportStatusRequest) {
OrderEntity orderEntity = orderService.findById(updateExportStatusRequest.getOrderId());
orderEntity.setReceiveStatus(1);
long customerId = customerService.getCustomerId();
if (customerId == 110) {
orderEntity.setReviewUser(authAdmin.getId().intValue());
}
@ -328,7 +355,10 @@ public class OrderController {
return ResultVOUtils.error(500, "未找到该业务单据");
}
updateExportStatusRequest.setOrderId(temp.getOrderIdFk());
return updateStatus(updateExportStatusRequest, null);
AuthAdmin authAdmin = customerService.getUserBean();
long customerId = customerService.getCustomerId();
return updateReview(authAdmin, customerId, updateExportStatusRequest);
}

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

@ -29,6 +29,7 @@ import com.glxp.sale.admin.res.basic.BussinessTypResponse;
import com.glxp.sale.admin.res.basic.CompanyProductRelevanceResponse;
import com.glxp.sale.admin.res.basic.UdiRelevanceResponse;
import com.glxp.sale.admin.res.inout.WarehouseResponse;
import com.glxp.sale.admin.res.inout.WarehouseUserResponse;
import com.glxp.sale.admin.service.auth.AuthAdminService;
import com.glxp.sale.admin.service.auth.CustomerService;
import com.glxp.sale.admin.service.basic.BasicUnitMaintainService;
@ -58,6 +59,7 @@ import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.validation.Valid;
import java.util.*;
import java.util.function.Consumer;
import java.util.stream.Collectors;
@RestController
@ -452,16 +454,16 @@ public class WareHouseController {
boolean checkSuccess = true;
String lostMsg = "";
//校验条码完整性
if ("是".equals(checkUdi.getScbssfbhph()) && StrUtil.isEmpty(udiEntity.getBatchNo())) {
if ("是".equals(checkUdi.getScbssfbhph()) && StrUtil.isEmpty(udiEntity.getBatchNo())) {
checkSuccess = false;
lostMsg = lostMsg + ",批次号";
}
if ("是".equals(checkUdi.getScbssfbhscrq()) && StrUtil.isEmpty(udiEntity.getProduceDate())) {
if ("是".equals(checkUdi.getScbssfbhscrq()) && StrUtil.isEmpty(udiEntity.getProduceDate())) {
checkSuccess = false;
lostMsg = lostMsg + ",生产日期";
}
if ("是".equals(checkUdi.getScbssfbhsxrq()) && StrUtil.isEmpty(udiEntity.getExpireDate())) {
if ("是".equals(checkUdi.getScbssfbhsxrq()) && StrUtil.isEmpty(udiEntity.getExpireDate())) {
checkSuccess = false;
lostMsg = lostMsg + ",失效日期";
}
@ -1043,7 +1045,15 @@ public class WareHouseController {
public BaseResponse getWarehouseUserList(String code) {
if (StringUtils.isBlank(code))
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
return ResultVOUtils.success(warehouseUserService.getListByCode(code));
List<WarehouseUserEntity> warehouseUserEntities = warehouseUserService.getListByCode(code);
List<WarehouseUserResponse> result = new ArrayList<>();
warehouseUserEntities.forEach(warehouseUserEntity -> {
WarehouseUserResponse warehouseUserResponse = new WarehouseUserResponse();
BeanUtils.copyProperties(warehouseUserEntity, warehouseUserResponse);
warehouseUserResponse.setUserid(warehouseUserEntity.getUserid() + "");
result.add(warehouseUserResponse);
});
return ResultVOUtils.success(result);
}
@AuthRuleAnnotation("")

1
api-admin/src/main/java/com/glxp/sale/admin/entity/basic/EntrustReceEntity.java
Unescape Escape View File

@ -10,6 +10,7 @@ public class EntrustReceEntity {
private Integer id;
private String action;
private String curInv;
private String entrustInv;
private String entrustUser;
private String userId;

1
api-admin/src/main/java/com/glxp/sale/admin/req/inout/StockOrderFilterRequest.java
Unescape Escape View File

@ -34,5 +34,6 @@ public class StockOrderFilterRequest extends ListPageRequest {
private Integer reviewUser;
private Integer userId;
private Integer unionUser;
private String entrustUser;
}

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

@ -19,5 +19,7 @@ public class EntrustReceRespose {
private String entrustName;
private String employeeName;
private String entrustInvName;
private String curInv;
private String curInvName;
}

34
api-admin/src/main/java/com/glxp/sale/admin/res/inout/WarehouseUserResponse.java
Unescape Escape View File

@ -0,0 +1,34 @@
package com.glxp.sale.admin.res.inout;
import lombok.Data;
@Data
public class WarehouseUserResponse {
/**
* id
*/
private String id;
/**
* 仓位码
*/
private String code;
/**
* 用户id
*/
private String userid;
/**
* 用户名/登录账号
*/
private String username;
/**
* 是否是仓库主管
*/
private boolean isDirector;
private String employeeName;
}

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

@ -30,12 +30,13 @@
resultType="com.glxp.sale.admin.res.basic.EntrustReceRespose">
select basic_entrust_accept.* ,
a.name curName, b.name entrustName,auth_user.employeeName
,inv_warehouse.name entrustInvName
,c.name entrustInvName,d.name curInvName
from basic_entrust_accept
LEFT JOIN basic_bussiness_type a on basic_entrust_accept.action = a.action
LEFT JOIN basic_bustype_local a on basic_entrust_accept.action = a.action
LEFT JOIN basic_bussiness_type b on basic_entrust_accept.entrustAction = b.action
LEFT JOIN auth_user on basic_entrust_accept.entrustUser = auth_user.id
LEFT JOIN inv_warehouse on basic_entrust_accept.entrustInv = inv_warehouse.`code`
LEFT JOIN inv_warehouse c on basic_entrust_accept.entrustInv = c.`code`
LEFT JOIN inv_warehouse d on basic_entrust_accept.curInv = d.`code`
<where>
<if test="id != '' and id!=null">
and id = #{id}
@ -60,8 +61,9 @@
<insert id="insertEntrustRec" keyProperty="id"
parameterType="com.glxp.sale.admin.entity.basic.EntrustReceEntity">
replace
INTO basic_entrust_accept(`action`, entrustInv, `entrustUser`, userId, updateTime, remark,entrustAction,finishRece)
INTO basic_entrust_accept(id,`action`, entrustInv, `entrustUser`, userId, updateTime, remark,entrustAction,finishRece,curInv)
values (
#{id},
#{action},
#{entrustInv},
#{entrustUser},
@ -69,7 +71,8 @@
#{updateTime},
#{remark},
#{entrustAction},
#{finishRece}
#{finishRece},
#{curInv}
)
</insert>
@ -81,7 +84,10 @@
<if test="entrustUser != null">entrustUser=#{entrustUser},</if>
<if test="userId != null">userId=#{userId},</if>
<if test="updateTime != null">updateTime=#{updateTime},</if>
<if test="curInv != null">curInv=#{curInv},</if>
<if test="remark != null">remark=#{remark},</if>
<if test="finishRece != null">finishRece=#{finishRece},</if>
<if test="entrustAction != null">entrustAction=#{entrustAction},</if>
</trim>
WHERE id = #{id}
</update>

22
api-admin/src/main/resources/mybatis/mapper/inout/StockOrderDao.xml
Unescape Escape View File

@ -181,6 +181,27 @@
</select>
<select id="filterEntrust" parameterType="com.glxp.sale.admin.req.inout.StockOrderFilterRequest"
resultType="com.glxp.sale.admin.entity.inout.StockOrderEntity">
SELECT stock_order.* FROM stock_order
INNER JOIN basic_entrust_accept on locStorageCode = basic_entrust_accept.curInv
<where>
<if test="status != '' and status!=null">
and status = #{status}
</if>
<if test="locStorageCode != '' and locStorageCode!=null">
and locStorageCode = #{locStorageCode}
</if>
<if test="entrustUser != '' and entrustUser!=null">
and basic_entrust_accept.entrustUser = #{entrustUser}
</if>
</where>
group by stock_order.id
ORDER BY id DESC
</select>
<select id="findOne" parameterType="com.glxp.sale.admin.req.inout.StockOrderFilterRequest"
resultType="com.glxp.sale.admin.entity.inout.StockOrderEntity">
SELECT * FROM stock_order
@ -197,7 +218,6 @@
<if test="billType != '' and billType !=null">
and billType =#{billType}
</if>
<if test="customerId != '' and customerId !=null">
and customerId =#{customerId}
</if>

Write Preview
Loading…
Cancel
Save