| | |
|---|
| | | private WrkMastLogService wrkMastLogService; |
|---|
| | | @Autowired |
|---|
| | | private LocOwnerService locOwnerService; |
|---|
| | | @Autowired |
|---|
| | | private OrderDetlPakinService orderDetlPakinService; |
|---|
| | | |
|---|
| | | @RequestMapping(value = "/order/nav/list/auth") |
|---|
| | | @ManagerAuth |
|---|
| | |
|---|
| | | wrapper.orderBy("settle").orderBy("create_time", false); |
|---|
| | | } |
|---|
| | | wrapper.eq("status", 1); |
|---|
| | | wrapper.eq("move_status", 0); |
|---|
| | | return R.ok(orderService.selectPage(new Page<>(curr, limit), wrapper)); |
|---|
| | | } |
|---|
| | | |
|---|
| | | @RequestMapping(value = "/actual/shipment/order/report/auth") |
|---|
| | | @ManagerAuth(memo = "上报MES实际组货单") |
|---|
| | | public R actualShipmentOrder(@RequestParam String orderNo) { |
|---|
| | | try{ |
|---|
| | | orderService.updateOrderStatus(orderNo); //更新订单状态 0 -> 1 |
|---|
| | | return R.ok("成功").add("成功"); |
|---|
| | | } catch (Exception e) {} |
|---|
| | | return R.error("失败").add("失败"); |
|---|
| | | } |
|---|
| | | |
|---|
| | | @RequestMapping(value = "/order/detl/all/auth") |
|---|
| | |
|---|
| | | throw new CoolException("存在作业中数据，不能完结。请检查入库通知档和工作档"); |
|---|
| | | } |
|---|
| | | } |
|---|
| | | |
|---|
| | | if(order.getSettle() == 66){ |
|---|
| | | List<OrderDetlPakin> lists = orderDetlPakinService.selectList(new EntityWrapper<OrderDetlPakin>().eq("order_no",order.getOrderNo())); |
|---|
| | | for (OrderDetlPakin orderDetlPakin : lists) { |
|---|
| | | String boxType3 = orderDetlPakin.getBoxType3(); |
|---|
| | | if (boxType3 == null || !boxType3.contains("HDU")) { |
|---|
| | | throw new CoolException( |
|---|
| | | String.format("订单 %s 的明细中不存在包含HDU的物料明细: %s (物料: %s)", |
|---|
| | | order.getOrderNo(), |
|---|
| | | boxType3, |
|---|
| | | orderDetlPakin.getMatnr() != null ? orderDetlPakin.getMatnr() : "未知物料" |
|---|
| | | ) |
|---|
| | | ); |
|---|
| | | } |
|---|
| | | } |
|---|
| | | } |
|---|
| | | order.setUpdateBy(getUserId()); |
|---|
| | | order.setUpdateTime(new Date()); |
|---|
| | | if (!orderService.updateById(order)) { |
|---|
