|
|
@ -17,6 +17,7 @@ import com.glxp.api.controller.inv.InvPreProductController;
|
|
|
|
import com.glxp.api.controller.inv.InvPreinProductController;
|
|
|
|
import com.glxp.api.controller.inv.InvPreinProductController;
|
|
|
|
import com.glxp.api.controller.inv.InvProductController;
|
|
|
|
import com.glxp.api.controller.inv.InvProductController;
|
|
|
|
import com.glxp.api.dao.auth.InvWarehouseDao;
|
|
|
|
import com.glxp.api.dao.auth.InvWarehouseDao;
|
|
|
|
|
|
|
|
import com.glxp.api.dao.basic.BasicDestinyRelMapper;
|
|
|
|
import com.glxp.api.entity.auth.AuthAdmin;
|
|
|
|
import com.glxp.api.entity.auth.AuthAdmin;
|
|
|
|
import com.glxp.api.entity.auth.InvWarehouseEntity;
|
|
|
|
import com.glxp.api.entity.auth.InvWarehouseEntity;
|
|
|
|
import com.glxp.api.entity.basic.BasicBusTypeChangeEntity;
|
|
|
|
import com.glxp.api.entity.basic.BasicBusTypeChangeEntity;
|
|
|
@ -27,15 +28,15 @@ import com.glxp.api.entity.inout.IoOrderEntity;
|
|
|
|
import com.glxp.api.entity.inout.PurReceiveDetailEntity;
|
|
|
|
import com.glxp.api.entity.inout.PurReceiveDetailEntity;
|
|
|
|
import com.glxp.api.entity.inout.PurReceiveEntity;
|
|
|
|
import com.glxp.api.entity.inout.PurReceiveEntity;
|
|
|
|
import com.glxp.api.entity.purchase.*;
|
|
|
|
import com.glxp.api.entity.purchase.*;
|
|
|
|
import com.glxp.api.req.inout.AddReceiveDetailRequest;
|
|
|
|
import com.glxp.api.exception.JsonException;
|
|
|
|
import com.glxp.api.req.inout.FilterReceiveDetailRequest;
|
|
|
|
import com.glxp.api.req.basic.FilterUdiRelRequest;
|
|
|
|
import com.glxp.api.req.inout.FilterReceiveRequest;
|
|
|
|
import com.glxp.api.req.inout.*;
|
|
|
|
import com.glxp.api.req.inout.UpdateReceiveDetailRequest;
|
|
|
|
|
|
|
|
import com.glxp.api.req.inv.FilterInvPreProductRequest;
|
|
|
|
import com.glxp.api.req.inv.FilterInvPreProductRequest;
|
|
|
|
import com.glxp.api.req.inv.FilterInvPreinProductRequest;
|
|
|
|
import com.glxp.api.req.inv.FilterInvPreinProductRequest;
|
|
|
|
import com.glxp.api.req.inv.FilterInvProductRequest;
|
|
|
|
import com.glxp.api.req.inv.FilterInvProductRequest;
|
|
|
|
import com.glxp.api.req.purchase.purReceiveRequest;
|
|
|
|
import com.glxp.api.req.purchase.purReceiveRequest;
|
|
|
|
import com.glxp.api.res.PageSimpleResponse;
|
|
|
|
import com.glxp.api.res.PageSimpleResponse;
|
|
|
|
|
|
|
|
import com.glxp.api.res.basic.UdiRelevanceResponse;
|
|
|
|
import com.glxp.api.res.inout.ReceiveDetailResponse;
|
|
|
|
import com.glxp.api.res.inout.ReceiveDetailResponse;
|
|
|
|
import com.glxp.api.res.inout.ReceiveResponse;
|
|
|
|
import com.glxp.api.res.inout.ReceiveResponse;
|
|
|
|
import com.glxp.api.res.inv.InvPreProductResponse;
|
|
|
|
import com.glxp.api.res.inv.InvPreProductResponse;
|
|
|
@ -119,6 +120,8 @@ public class PurOrderReceiveController extends BaseController {
|
|
|
|
SysApprovalFlowService sysApprovalFlowService;
|
|
|
|
SysApprovalFlowService sysApprovalFlowService;
|
|
|
|
@Resource
|
|
|
|
@Resource
|
|
|
|
SystemParamConfigService systemParamConfigService;
|
|
|
|
SystemParamConfigService systemParamConfigService;
|
|
|
|
|
|
|
|
@Resource
|
|
|
|
|
|
|
|
BasicDestinyRelMapper basicDestinyRelMapper;
|
|
|
|
|
|
|
|
|
|
|
|
final String type = "ly";
|
|
|
|
final String type = "ly";
|
|
|
|
|
|
|
|
|
|
|
@ -711,6 +714,72 @@ public class PurOrderReceiveController extends BaseController {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@AuthRuleAnnotation("")
|
|
|
|
|
|
|
|
@PostMapping("/udiwms/receive/detail/addWarlockBag")
|
|
|
|
|
|
|
|
public BaseResponse updateReceiveByWarlockBag(@RequestBody AddReceiveDetailRequest addReceiveDetailRequest, BindingResult bindingResult) {
|
|
|
|
|
|
|
|
if (bindingResult.hasErrors()) {
|
|
|
|
|
|
|
|
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
AuthAdmin authAdmin = getUser();
|
|
|
|
|
|
|
|
String orderNo = addReceiveDetailRequest.getPurReceiveEntity().getBillNo();
|
|
|
|
|
|
|
|
if (addReceiveDetailRequest.getPurReceiveEntity() == null)
|
|
|
|
|
|
|
|
return ResultVOUtils.error(500, "未指定订单");
|
|
|
|
|
|
|
|
if (StringUtils.isEmpty(addReceiveDetailRequest.getBagId())) {
|
|
|
|
|
|
|
|
return ResultVOUtils.error(500, "未选择术式套包信息");
|
|
|
|
|
|
|
|
}else {
|
|
|
|
|
|
|
|
String bagId = addReceiveDetailRequest.getBagId();
|
|
|
|
|
|
|
|
FilterUdiRelRequest filterUdiRelRequest = new FilterUdiRelRequest();
|
|
|
|
|
|
|
|
filterUdiRelRequest.setDestinyId(bagId + "");
|
|
|
|
|
|
|
|
filterUdiRelRequest.setDiType(1);
|
|
|
|
|
|
|
|
List<UdiRelevanceResponse> list = basicDestinyRelMapper.filterDestinyProducts(filterUdiRelRequest);
|
|
|
|
|
|
|
|
if (CollUtil.isEmpty(list)) throw new JsonException("术式套包数据为空!");
|
|
|
|
|
|
|
|
List<AddReceiveDetailRequest.DetaiData> datas = new ArrayList<>();
|
|
|
|
|
|
|
|
list.forEach( x -> {
|
|
|
|
|
|
|
|
AddReceiveDetailRequest.DetaiData detaiData = new AddReceiveDetailRequest.DetaiData();
|
|
|
|
|
|
|
|
detaiData.setRelId(x.getRelIdFk());
|
|
|
|
|
|
|
|
detaiData.setSupId(x.getSupId());
|
|
|
|
|
|
|
|
detaiData.setNameCode(x.getNameCode());
|
|
|
|
|
|
|
|
detaiData.setPrice(x.getPrice());
|
|
|
|
|
|
|
|
detaiData.setCount(x.getCount());
|
|
|
|
|
|
|
|
datas.add(detaiData);
|
|
|
|
|
|
|
|
});
|
|
|
|
|
|
|
|
addReceiveDetailRequest.setDatas(datas);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (CollUtil.isEmpty(addReceiveDetailRequest.getDatas())) {
|
|
|
|
|
|
|
|
return ResultVOUtils.error(500, "未选择产品信息");
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
PurReceiveEntity purReceiveEntity = addReceiveDetailRequest.getPurReceiveEntity();
|
|
|
|
|
|
|
|
if (StrUtil.isEmpty(purReceiveEntity.getBillNo())) {
|
|
|
|
|
|
|
|
InvWarehouseEntity curWarehouseEntity = invWarehouseService.findByInvSubByCode(purReceiveEntity.getInvCode());
|
|
|
|
|
|
|
|
InvWarehouseEntity targetWarehouseEntity = invWarehouseService.findByInvSubByCode(purReceiveEntity.getTargetInvCode());
|
|
|
|
|
|
|
|
orderNo = gennerOrderUtils.createStOrderNo(new OrderNoTypeBean(Constant.LIN_YONG, "yyyyMMdd"));
|
|
|
|
|
|
|
|
purReceiveEntity.setBillNo(orderNo);
|
|
|
|
|
|
|
|
purReceiveEntity.setCreateUser(authAdmin.getId() + "");
|
|
|
|
|
|
|
|
purReceiveEntity.setCreateTime(new Date());
|
|
|
|
|
|
|
|
purReceiveEntity.setStatus(1);
|
|
|
|
|
|
|
|
purReceiveEntity.setDeptCode(curWarehouseEntity.getParentId());
|
|
|
|
|
|
|
|
purReceiveEntity.setTargetDeptCode(targetWarehouseEntity.getParentId());
|
|
|
|
|
|
|
|
receiveService.insertOrder(purReceiveEntity);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
for (AddReceiveDetailRequest.DetaiData detaiData : addReceiveDetailRequest.getDatas()) {
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
PurReceiveDetailEntity purReceiveDetailEntity = new PurReceiveDetailEntity();
|
|
|
|
|
|
|
|
purReceiveDetailEntity.setOrderIdFk(purReceiveEntity.getBillNo());
|
|
|
|
|
|
|
|
purReceiveDetailEntity.setNameCode(detaiData.getNameCode());
|
|
|
|
|
|
|
|
purReceiveDetailEntity.setExpireDate(detaiData.getExpireDate());
|
|
|
|
|
|
|
|
purReceiveDetailEntity.setProductDate(detaiData.getProductDate());
|
|
|
|
|
|
|
|
purReceiveDetailEntity.setRelIdFk(detaiData.getRelId());
|
|
|
|
|
|
|
|
purReceiveDetailEntity.setBatchNo(detaiData.getBatchNo());
|
|
|
|
|
|
|
|
purReceiveDetailEntity.setPrice(detaiData.getPrice());
|
|
|
|
|
|
|
|
purReceiveDetailEntity.setSupId(detaiData.getSupId());
|
|
|
|
|
|
|
|
receivedetailService.insert(purReceiveDetailEntity);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
purReceiveEntity.setUpdateTime(new Date());
|
|
|
|
|
|
|
|
receiveService.updateOrder(purReceiveEntity);
|
|
|
|
|
|
|
|
return ResultVOUtils.success(orderNo);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
public Date timeProcess(Date date, Integer timeCount) {
|
|
|
|
public Date timeProcess(Date date, Integer timeCount) {
|
|
|
|
Calendar rightNow = Calendar.getInstance();
|
|
|
|
Calendar rightNow = Calendar.getInstance();
|
|
|
|