|
|
|
|
@ -110,7 +110,6 @@ public class IoOrderDetailBizController extends BaseController {
|
|
|
|
|
ReceivedetailService receivedetailService;
|
|
|
|
|
@Resource
|
|
|
|
|
IBasicBusTypeChangeService basicBusTypeChangeService;
|
|
|
|
|
|
|
|
|
|
@Resource
|
|
|
|
|
IoOrderInvoiceService ioOrderInvoiceService;
|
|
|
|
|
|
|
|
|
|
@ -134,9 +133,7 @@ public class IoOrderDetailBizController extends BaseController {
|
|
|
|
|
@PostMapping("/udiwms/inout/order/addBizProduct")
|
|
|
|
|
@Log(title = "单据管理", businessType = BusinessType.INSERT)
|
|
|
|
|
public BaseResponse addBizProduct(@RequestBody AddBizProductReqeust addBizProductReqeust) {
|
|
|
|
|
|
|
|
|
|
return orderDetailBizService.addBizProduct(addBizProductReqeust);
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@ -205,10 +202,8 @@ public class IoOrderDetailBizController extends BaseController {
|
|
|
|
|
return ResultVOUtils.error(500, "第三方单据所属仓库不能为空！");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
//获取往来信息
|
|
|
|
|
if (bussinessTypeEntity.getCorpType() == ConstantStatus.CORP_TYPE_INNOR) {//内部调拨
|
|
|
|
|
|
|
|
|
|
InvWarehouseEntity invWarehouseEntity = invWarehouseService.selectByThrCode(thrOrderEntity.getCorpId(), thrOrderEntity.getThirdSysFk());
|
|
|
|
|
orderEntity.setFromDeptCode(invWarehouseEntity.getParentId());
|
|
|
|
|
orderEntity.setFromInvCode(invWarehouseEntity.getCode());
|
|
|
|
|
@ -259,7 +254,6 @@ public class IoOrderDetailBizController extends BaseController {
|
|
|
|
|
}
|
|
|
|
|
ioOrderDetailBizEntity.setBindRlIds(bindRlIds.substring(1));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
ioOrderDetailBizEntity.setOrderIdFk(orderEntity.getBillNo());
|
|
|
|
|
ioOrderDetailBizEntity.setProductDate(thrOrderDetailEntity.getProductDate());
|
|
|
|
|
@ -285,7 +279,6 @@ public class IoOrderDetailBizController extends BaseController {
|
|
|
|
|
@Resource
|
|
|
|
|
BasicCorpService basicCorpService;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
//选入领用单据至业务单据
|
|
|
|
|
@AuthRuleAnnotation("")
|
|
|
|
|
@PostMapping("/udiwms/inout/order/addReceiveOrder")
|
|
|
|
|
@ -414,7 +407,6 @@ public class IoOrderDetailBizController extends BaseController {
|
|
|
|
|
orderDetailBizService.insert(ioOrderDetailBizEntity);
|
|
|
|
|
}
|
|
|
|
|
return ResultVOUtils.success("选入成功！");
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@ -433,8 +425,6 @@ public class IoOrderDetailBizController extends BaseController {
|
|
|
|
|
return ResultVOUtils.success("删除成功！");
|
|
|
|
|
}
|
|
|
|
|
return ResultVOUtils.error(500, "删除失败");
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@ -492,11 +482,7 @@ public class IoOrderDetailBizController extends BaseController {
|
|
|
|
|
@PostMapping("/udiwms/inout/biz/updateBind")
|
|
|
|
|
@Log(title = "单据管理", businessType = BusinessType.UPDATE)
|
|
|
|
|
public BaseResponse updateBindSup(@RequestBody BizBindUpdateRequest bizBindUpdateRequest) {
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
IoOrderDetailBizEntity orderDetailBizEntity = orderDetailBizService.selectById(bizBindUpdateRequest.getId());
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (bizBindUpdateRequest.getBindRlFk() != null)
|
|
|
|
|
orderDetailBizEntity.setBindRlFk(bizBindUpdateRequest.getBindRlFk());
|
|
|
|
|
if (StrUtil.isNotEmpty(bizBindUpdateRequest.getSupId())) {
|
|
|
|
|
@ -516,22 +502,18 @@ public class IoOrderDetailBizController extends BaseController {
|
|
|
|
|
@PostMapping("/udiwms/inout/biz/deleteById")
|
|
|
|
|
@Log(title = "发票管理", businessType = BusinessType.DELETE)
|
|
|
|
|
public BaseResponse deleteById(@RequestBody IoOrderInvoiceEntity ioOrderInvoiceEntity) {
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
IoOrderInvoiceResponse ioOrderInvoiceResponse = orderDetailBizService.selectByinvoiceId(ioOrderInvoiceEntity.getId());
|
|
|
|
|
|
|
|
|
|
//更改 登记状态
|
|
|
|
|
IoOrderDetailCodeEntity ioOrderDetailBizEntity = new IoOrderDetailCodeEntity();
|
|
|
|
|
|
|
|
|
|
FilterOrderDetailBizRequest filterOrderDetailBizRequest = new FilterOrderDetailBizRequest();
|
|
|
|
|
FilterOrderDetailBizRequest filterOrderDetailBizRequest1 = new FilterOrderDetailBizRequest();
|
|
|
|
|
filterOrderDetailBizRequest1.setOrderIdFk(ioOrderInvoiceEntity.getOrderIdFk());
|
|
|
|
|
filterOrderDetailBizRequest1.setBatchNo(ioOrderInvoiceEntity.getBatchNo());
|
|
|
|
|
|
|
|
|
|
filterOrderDetailBizRequest.setOrderIdFk(ioOrderInvoiceEntity.getOrderIdFk());
|
|
|
|
|
filterOrderDetailBizRequest.setBatchNo(ioOrderInvoiceEntity.getBatchNo());
|
|
|
|
|
filterOrderDetailBizRequest.setRelId(ioOrderInvoiceEntity.getBizIdFk());
|
|
|
|
|
|
|
|
|
|
//更改 登记状态
|
|
|
|
|
IoOrderDetailCodeEntity ioOrderDetailBizEntity = new IoOrderDetailCodeEntity();
|
|
|
|
|
ioOrderDetailBizEntity.setOrderIdFk(ioOrderInvoiceEntity.getOrderIdFk());
|
|
|
|
|
ioOrderDetailBizEntity.setBatchNo(ioOrderInvoiceEntity.getBatchNo());
|
|
|
|
|
ioOrderDetailBizEntity.setBindRlFk(ioOrderInvoiceEntity.getBizIdFk());
|
|
|
|
|
@ -546,8 +528,6 @@ public class IoOrderDetailBizController extends BaseController {
|
|
|
|
|
}
|
|
|
|
|
orderDetailCodeService.updateOrderDetailBiz(ioOrderDetailBizEntity);
|
|
|
|
|
return ResultVOUtils.success(ioOrderInvoiceResponses);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
@ -556,7 +536,6 @@ public class IoOrderDetailBizController extends BaseController {
|
|
|
|
|
* @param ioOrderInvoiceRequest
|
|
|
|
|
* @return
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
@PostMapping("/udiwms/inout/biz/updateById")
|
|
|
|
|
@Log(title = "发票管理", businessType = BusinessType.UPDATE)
|
|
|
|
|
public BaseResponse updateById(@RequestBody IoOrderInvoiceRequest ioOrderInvoiceRequest) {
|
|
|
|
|
@ -613,7 +592,6 @@ public class IoOrderDetailBizController extends BaseController {
|
|
|
|
|
orderEntity.setUpdateTime(new Date());
|
|
|
|
|
orderService.update(orderEntity);
|
|
|
|
|
return ResultVOUtils.success("成功");
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@ -641,7 +619,6 @@ public class IoOrderDetailBizController extends BaseController {
|
|
|
|
|
orderEntity.setUpdateTime(new Date());
|
|
|
|
|
orderService.update(orderEntity);
|
|
|
|
|
return ResultVOUtils.success("成功");
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@ -656,9 +633,6 @@ public class IoOrderDetailBizController extends BaseController {
|
|
|
|
|
List<IoOrderDetailResultResponse> ioOrderDetailCodeResponses = orderDetailBizService.getfilterOrderList(orderDetailBizRequest);
|
|
|
|
|
List<IoOrderInvoiceEntity> orderInvoiceEntities = ioOrderInvoiceService.findByBillNo(orderDetailBizRequest.getOrderIdFk());
|
|
|
|
|
for (IoOrderDetailResultResponse orderDetailCodeEntity : ioOrderDetailCodeResponses) {
|
|
|
|
|
// if (orderDetailCodeEntity.getReCount() != 0 && orderDetailCodeEntity.getPrice() != null) {
|
|
|
|
|
// orderDetailCodeEntity.setAmount(new BigDecimal(orderDetailCodeEntity.getReCount()).multiply(orderDetailCodeEntity.getPrice()));
|
|
|
|
|
// }
|
|
|
|
|
if (orderDetailCodeEntity.getCount() != 0 && orderDetailCodeEntity.getPrice() != null) {
|
|
|
|
|
orderDetailCodeEntity.setAmount(new BigDecimal(orderDetailCodeEntity.getCount()).multiply(orderDetailCodeEntity.getPrice()));
|
|
|
|
|
}
|
|
|
|
|
@ -687,7 +661,6 @@ public class IoOrderDetailBizController extends BaseController {
|
|
|
|
|
return ResultVOUtils.page(pageInfo);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@Resource
|
|
|
|
|
IoCodeTempService ioCodeTempService;
|
|
|
|
|
@Resource
|
|
|
|
|
@ -697,7 +670,6 @@ public class IoOrderDetailBizController extends BaseController {
|
|
|
|
|
@Resource
|
|
|
|
|
IoCodeLostService ioCodeLostService;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
//录入阿里送货单的业务单据详情
|
|
|
|
|
@AuthRuleAnnotation("")
|
|
|
|
|
@PostMapping("/udiwms/inout/order/addAliBizProduct")
|
|
|
|
|
@ -730,14 +702,11 @@ public class IoOrderDetailBizController extends BaseController {
|
|
|
|
|
return ResultVOUtils.error("单据码明细为空！");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
IoOrderEntity ioOrderEntity = addBizProductReqeust.getOrderEntity();
|
|
|
|
|
addBizProductReqeust.setAliOrderBillNo(billCode);
|
|
|
|
|
ioOrderEntity.setAliOrderBillNo(billCode);
|
|
|
|
|
for (int i = 0; i < aliYljgBillDetailDrugList.size(); i++) {
|
|
|
|
|
AliYljgBillDetailDrug aliYljgBillDetailDrug = aliYljgBillDetailDrugList.get(i);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
AliYljgBillDetailDrugCode aliYljgBillDetailDrugCode1 = aliYljgBillDetailDrug.getAliYljgBillDetailDrugCodeList().get(0);
|
|
|
|
|
String code = aliYljgBillDetailDrugCode1.getCode();
|
|
|
|
|
if (StrUtil.isEmpty(code)) {
|
|
|
|
|
|
qiuyt
4 months ago
committed by
chenhc