|
|
|
@ -40,6 +40,7 @@ import javax.annotation.Resource;
|
|
|
|
|
import java.math.BigDecimal;
|
|
|
|
|
import java.util.ArrayList;
|
|
|
|
|
import java.util.Arrays;
|
|
|
|
|
import java.util.Date;
|
|
|
|
|
import java.util.List;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@ -137,15 +138,15 @@ public class IoOrderController extends BaseController {
|
|
|
|
|
List<IoOrderResponse> list = orderService.getfilterList(filterOrderRequest);
|
|
|
|
|
|
|
|
|
|
for (IoOrderResponse ioOrderResponse : list) {
|
|
|
|
|
if(ioOrderResponse.getCheckStatus() == null){
|
|
|
|
|
ioOrderResponse.setCheckStatus(0+"");
|
|
|
|
|
if (ioOrderResponse.getCheckStatus() == null) {
|
|
|
|
|
ioOrderResponse.setCheckStatus(0 + "");
|
|
|
|
|
}
|
|
|
|
|
FilterOrderDetailCodeRequest filterOrderDetailCodeRequest = new FilterOrderDetailCodeRequest();
|
|
|
|
|
filterOrderDetailCodeRequest.setOrderIdFk(ioOrderResponse.getBillNo());
|
|
|
|
|
List<IoOrderDetailCodeResponse> ioOrderDetailCodeResponses = orderDetailBizService.getfilterList(filterOrderDetailCodeRequest);
|
|
|
|
|
BigDecimal amount=new BigDecimal(0.00);
|
|
|
|
|
BigDecimal amount = new BigDecimal(0.00);
|
|
|
|
|
for (IoOrderDetailCodeResponse ioOrderDetailCodeRespons : ioOrderDetailCodeResponses) {
|
|
|
|
|
if(ioOrderDetailCodeRespons.getCount() != 0 && ioOrderDetailCodeRespons.getPrice()!=null) {
|
|
|
|
|
if (ioOrderDetailCodeRespons.getCount() != 0 && ioOrderDetailCodeRespons.getPrice() != null) {
|
|
|
|
|
amount = amount.add(new BigDecimal(ioOrderDetailCodeRespons.getCount()).multiply(ioOrderDetailCodeRespons.getPrice()));
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
@ -632,6 +633,7 @@ public class IoOrderController extends BaseController {
|
|
|
|
|
@PostMapping("/udiwms/inout/order/updateOrder")
|
|
|
|
|
@Log(title = "单据管理", businessType = BusinessType.UPDATE)
|
|
|
|
|
public BaseResponse updateOrder(@RequestBody IoOrderEntity ioOrderEntity) {
|
|
|
|
|
ioOrderEntity.setUpdateTime(new Date());
|
|
|
|
|
orderService.updateByBillNo(ioOrderEntity);
|
|
|
|
|
return ResultVOUtils.success();
|
|
|
|
|
}
|
|
|
|
|