package com.zy.asrs.controller;
|
|
import com.alibaba.fastjson.JSONObject;
|
import com.baomidou.mybatisplus.mapper.EntityWrapper;
|
import com.baomidou.mybatisplus.mapper.Wrapper;
|
import com.baomidou.mybatisplus.plugins.Page;
|
import com.core.annotations.ManagerAuth;
|
import com.core.common.*;
|
import com.core.exception.CoolException;
|
import com.zy.asrs.entity.*;
|
import com.zy.asrs.entity.param.OrderDomainParam;
|
|
import com.zy.asrs.entity.result.WrkTraceVo;
|
import com.zy.asrs.service.*;
|
import com.zy.common.model.DetlDto;
|
import com.zy.common.web.BaseController;
|
import org.springframework.beans.BeanUtils;
|
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.transaction.annotation.Transactional;
|
import org.springframework.web.bind.annotation.*;
|
|
import java.util.*;
|
|
@RestController
|
public class OrderController extends BaseController {
|
|
@Autowired
|
private OrderService orderService;
|
@Autowired
|
private OrderDetlService orderDetlService;
|
@Autowired
|
private SnowflakeIdWorker snowflakeIdWorker;
|
@Autowired
|
private DocTypeService docTypeService;
|
@Autowired
|
private WrkDetlService wrkDetlService;
|
@Autowired
|
private WaitPakinService waitPakinService;
|
@Autowired
|
private LocDetlService locDetlService;
|
@Autowired
|
private WrkMastService wrkMastService;
|
@Autowired
|
private WrkMastLogService wrkMastLogService;
|
|
@RequestMapping(value = "/order/nav/list/auth")
|
@ManagerAuth
|
public R navList(@RequestParam(required = false) String orderNo){
|
EntityWrapper<Order> wrapper = new EntityWrapper<>();
|
if (!Cools.isEmpty(orderNo)) {
|
wrapper.like("order_no", orderNo);
|
}
|
wrapper.le("settle", 2).eq("status", 1);
|
wrapper.orderBy("create_time", false);
|
List<Order> orders = orderService.selectList(wrapper);
|
// 保留出库单
|
if (!Cools.isEmpty(orders)) {
|
Iterator<Order> iterator = orders.iterator();
|
while (iterator.hasNext()) {
|
Order order = iterator.next();
|
if (order.getDocType() != null) {
|
DocType docType = docTypeService.selectById(order.getDocType());
|
if (docType != null) {
|
if (docType.getPakout() == 0) {
|
iterator.remove();
|
}
|
}
|
}
|
}
|
}
|
R r = R.ok();
|
r.put("data", orders);
|
return r;
|
}
|
|
@RequestMapping(value = "/order/head/page/auth")
|
@ManagerAuth
|
public R head(@RequestParam(defaultValue = "1")Integer curr,
|
@RequestParam(defaultValue = "10")Integer limit,
|
@RequestParam(required = false)String orderByField,
|
@RequestParam(required = false)String orderByType,
|
@RequestParam Map<String, Object> param){
|
EntityWrapper<Order> wrapper = new EntityWrapper<>();
|
excludeTrash(param);
|
convert(param, wrapper);
|
if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));} else {
|
wrapper.orderBy("settle").orderBy("create_time", false);
|
}
|
wrapper.eq("status", 1);
|
return R.ok(orderService.selectPage(new Page<>(curr, limit), wrapper));
|
}
|
|
@RequestMapping(value = "/order/detl/all/auth")
|
@ManagerAuth
|
public R head(@RequestParam Long orderId){
|
R r = R.ok();
|
r.put("data",orderDetlService.selectList(new EntityWrapper<OrderDetl>().eq("order_id", orderId)));
|
return r;
|
}
|
|
@RequestMapping(value = "/order/inspect/list/auth")
|
@ManagerAuth
|
public R inspectList(@RequestParam(required = false) String orderNo){
|
// 1. 查找包含“检验”或“Inspection”的 DocType IDs
|
List<DocType> docTypes = docTypeService.selectList(new EntityWrapper<DocType>()
|
.like("doc_name", "检验")
|
.or()
|
.like("doc_name", "Inspection"));
|
|
if (Cools.isEmpty(docTypes)) {
|
R r = R.ok();
|
r.put("data", new ArrayList<>());
|
return r;
|
}
|
|
List<Long> docTypeIds = new ArrayList<>();
|
for (DocType dt : docTypes) {
|
docTypeIds.add(dt.getDocId());
|
}
|
|
// 2. 查找对应类型的订单
|
EntityWrapper<Order> wrapper = new EntityWrapper<>();
|
if (!Cools.isEmpty(orderNo)) {
|
wrapper.like("order_no", orderNo);
|
}
|
wrapper.in("doc_type", docTypeIds);
|
wrapper.le("settle", 2); // 待处理或处理中
|
wrapper.eq("status", 1);
|
wrapper.orderBy("create_time", false);
|
|
List<Order> orders = orderService.selectList(wrapper);
|
R r = R.ok();
|
r.put("data", orders);
|
return r;
|
}
|
|
@RequestMapping(value = "/order/inspection/matchingLocations/auth")
|
@ManagerAuth
|
public R queryMatchingLocations(
|
@RequestParam(required = false) String poNumber,
|
@RequestParam(required = false) String style,
|
@RequestParam(required = false) String color,
|
@RequestParam(required = false) Integer cartonNumberFrom,
|
@RequestParam(required = false) Integer cartonNumberTo) {
|
if(Cools.isEmpty(poNumber)){
|
return R.error("response.poNumber_no_exists");
|
}
|
|
EntityWrapper<LocDetl> wrapper = new EntityWrapper<>();
|
if (!Cools.isEmpty(poNumber)) {
|
wrapper.eq("sku", poNumber);
|
}
|
if (!Cools.isEmpty(style)) {
|
wrapper.eq("specs", style);
|
}
|
if (!Cools.isEmpty(color)) {
|
wrapper.eq("color", color);
|
}
|
wrapper.eq("item_num",null);
|
|
List<LocDetl> all = locDetlService.selectList(wrapper);
|
List<LocDetl> list = new ArrayList<>();
|
|
if (cartonNumberFrom == null && cartonNumberTo == null) {
|
list = all;
|
} else {
|
for (LocDetl item : all) {
|
String batch = item.getBatch();
|
if (Cools.isEmpty(batch)) {
|
continue;
|
}
|
String numStr = batch.replaceAll("[^0-9]", "");
|
if (Cools.isEmpty(numStr)) {
|
continue;
|
}
|
Integer num;
|
try {
|
num = Integer.parseInt(numStr);
|
} catch (NumberFormatException e) {
|
continue;
|
}
|
if (cartonNumberFrom != null && num < cartonNumberFrom) {
|
continue;
|
}
|
if (cartonNumberTo != null && num > cartonNumberTo) {
|
continue;
|
}
|
list.add(item);
|
}
|
}
|
|
Map<String, Object> data = new HashMap<>();
|
data.put("records", list);
|
data.put("total", list.size());
|
|
return R.ok(data);
|
}
|
|
@RequestMapping(value = "/order/inspection/create/auth")
|
@ManagerAuth(memo = "response.create_inspection_order")
|
@Transactional
|
public R createInspectionOrder(@RequestBody Map<String, Object> params) {
|
String orderNo = (String) params.get("orderNo");
|
String buyerShortCode = (String) params.get("buyerShortCode");
|
List<Map<String, Object>> records = (List<Map<String, Object>>) params.get("records");
|
|
if (Cools.isEmpty(orderNo) || Cools.isEmpty(records)) {
|
return R.error("response.invalid_param");
|
}
|
|
Order orderCheck = orderService.selectByNo(orderNo);
|
if (orderCheck != null) {
|
return R.error("response.order_no_exists");
|
}
|
|
Date now = new Date();
|
Long userId = getUserId();
|
|
// 查找检验类型的单据
|
DocType inspectionDocType = docTypeService.selectOne(new EntityWrapper<DocType>().like("doc_name", "检验").or().like("doc_name", "Inspection"));
|
Long docTypeId = (inspectionDocType != null) ? inspectionDocType.getDocId() : null;
|
|
// 使用与 formAdd 相同的完整构造函数确保所有必要字段都被初始化
|
Order order = new Order(
|
String.valueOf(snowflakeIdWorker.nextId()), // 编号[非空]
|
orderNo, // 订单编号
|
DateUtils.convert(now), // 单据日期
|
docTypeId, // 单据类型
|
null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,
|
1L, // 订单状态 (待处理)
|
1, // 状态 (正常)
|
userId, now, userId, now,
|
"Inspection Order for Buyer: " + buyerShortCode // 备注
|
);
|
|
if (!orderService.insert(order)) {
|
throw new CoolException("response.save_order_master_failed");
|
}
|
|
// 保存所有检索到的记录作为订单明细
|
for (Map<String, Object> record : records) {
|
OrderDetl detl = new OrderDetl();
|
detl.setOrderId(Long.valueOf(order.getId()));
|
detl.setOrderNo(order.getOrderNo());
|
detl.setMatnr((String) record.get("matnr"));
|
detl.setMaktx((String) record.get("maktx"));
|
detl.setSpecs((String) record.get("specs"));
|
detl.setColor((String) record.get("color"));
|
detl.setBatch((String) record.get("batch"));
|
detl.setAnfme(Double.valueOf(String.valueOf(record.get("anfme"))));
|
detl.setSku((String) record.get("sku"));
|
detl.setOrigin((String) record.get("zpallet"));
|
detl.setBarcode((String) record.get("barcode"));
|
detl.setManu((String) record.get("manu"));
|
detl.setManuDate((String) record.get("manuDate"));
|
|
detl.setWorkQty(0.0);
|
detl.setQty(0.0);
|
detl.setStatus(1);
|
detl.setCreateBy(userId);
|
detl.setCreateTime(now);
|
detl.setUpdateBy(userId);
|
detl.setUpdateTime(now);
|
|
if (!orderDetlService.insert(detl)) {
|
throw new CoolException("response.save_order_detail_failed");
|
}
|
LocDetl locDetl = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("zpallet", detl.getOrigin()).eq("batch",detl.getBatch()));
|
if (locDetl != null) {
|
if (!locDetlService.updateInspectNumber(detl.getOrigin(),detl.getBatch(),detl.getOrderNo())) {
|
throw new CoolException("response.save_order_detail_failed");
|
}
|
}
|
}
|
|
return R.ok("response.order_add_success");
|
}
|
|
@RequestMapping(value = "/order/form/add/auth")
|
@ManagerAuth(memo = "response.manual_add_order")
|
@Transactional
|
public R formAdd(@RequestBody OrderDomainParam param){
|
if(Cools.isEmpty(param.getOrderNo())){
|
String prefix = "";
|
DocType docType = docTypeService.selectById(param.getDocType());
|
if(!Cools.isEmpty(docType)){
|
prefix = docType.getPakin() == 1 ? "RK" : "CK";
|
}
|
param.setOrderNo(prefix + snowflakeIdWorker.nextId());
|
}
|
Order order = orderService.selectByNo(param.getOrderNo());
|
if (order != null) {
|
return R.error("response.order_no_exists");
|
}
|
Date now = new Date();
|
order = new Order(
|
String.valueOf(snowflakeIdWorker.nextId()), // 编号[非空]
|
param.getOrderNo(), // 订单编号
|
DateUtils.convert(now), // 单据日期
|
param.getDocType(), // 单据类型
|
null, // 项目编号
|
null, //
|
null, // 调拨项目编号
|
null, // 初始票据号
|
null, // 票据号
|
null, // 客户编号
|
null, // 客户
|
null, // 联系方式
|
null, // 操作人员
|
null, // 合计金额
|
null, // 优惠率
|
null, // 优惠金额
|
null, // 销售或采购费用合计
|
null, // 实付金额
|
null, // 付款类型
|
null, // 业务员
|
null, // 结算天数
|
null, // 邮费支付类型
|
null, // 邮费
|
null, // 付款时间
|
null, // 发货时间
|
null, // 物流名称
|
null, // 物流单号
|
1L, // 订单状态
|
1, // 状态
|
getUserId(), // 添加人员
|
now, // 添加时间
|
getUserId(), // 修改人员
|
now, // 修改时间
|
null // 备注
|
);
|
if (!orderService.insert(order)) {
|
throw new CoolException("response.save_order_master_failed");
|
}
|
List<DetlDto> list = new ArrayList<>();
|
for (OrderDetl orderDetl : param.getOrderDetlList()) {
|
DetlDto dto = new DetlDto(orderDetl.getMatnr(), orderDetl.getBatch());
|
if (DetlDto.has(list, dto)) {
|
OrderDetl item = orderDetlService.selectItem(order.getId(), orderDetl.getMatnr(), orderDetl.getBatch(),orderDetl.getBarcode());
|
item.setAnfme(item.getAnfme() + orderDetl.getAnfme());
|
if (!orderDetlService.updateById(item)) {
|
throw new CoolException("response.save_order_detail_failed");
|
}
|
} else {
|
list.add(dto);
|
orderDetl.setOrderId(order.getId());
|
orderDetl.setOrderNo(order.getOrderNo());
|
orderDetl.setCreateBy(getUserId());
|
orderDetl.setCreateTime(now);
|
orderDetl.setUpdateBy(getUserId());
|
orderDetl.setUpdateTime(now);
|
orderDetl.setStatus(1);
|
orderDetl.setQty(0.0D);
|
if (!orderDetlService.insert(orderDetl)) {
|
throw new CoolException("response.save_order_detail_failed");
|
}
|
}
|
}
|
return R.ok("response.order_add_success");
|
}
|
|
@RequestMapping(value = "/order/form/modify/auth")
|
@ManagerAuth(memo = "response.manual_modify_order")
|
@Transactional
|
public R formModify(@RequestBody OrderDomainParam param){
|
Order order = orderService.selectById(param.getOrderId());
|
if (order == null || order.getStatus() == 0) {
|
return R.error("response.order_not_exist");
|
}
|
Date now = new Date();
|
Long userId = getUserId();
|
// 修改主档
|
if (!param.getDocType().equals(order.getDocType())) {
|
order.setDocType(param.getDocType());
|
order.setUpdateBy(userId);
|
order.setUpdateTime(now);
|
if (!orderService.updateById(order)) {
|
throw new CoolException("response.modify_order_type_failed");
|
}
|
}
|
// 修改明细档
|
// List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order.getId());
|
// 1.清空明细档
|
if (!orderDetlService.delete(new EntityWrapper<OrderDetl>().eq("order_id", order.getId()))) {
|
throw new CoolException("response.clear_order_detail_failed");
|
}
|
// 2.重组数据
|
List<DetlDto> list = new ArrayList<>();
|
for (OrderDetl orderDetl : param.getOrderDetlList()) {
|
DetlDto dto = new DetlDto(orderDetl.getMatnr(), orderDetl.getBatch());
|
if (DetlDto.has(list, dto)) {
|
OrderDetl item = orderDetlService.selectItem(order.getId(), orderDetl.getMatnr(), orderDetl.getBatch(),orderDetl.getBarcode());
|
item.setAnfme(item.getAnfme() + orderDetl.getAnfme());
|
if (!orderDetlService.updateById(item)) {
|
throw new CoolException("response.save_order_detail_failed");
|
}
|
} else {
|
list.add(dto);
|
orderDetl.setOrderId(order.getId());
|
orderDetl.setOrderNo(order.getOrderNo());
|
orderDetl.setCreateBy(getUserId());
|
orderDetl.setCreateTime(now);
|
orderDetl.setUpdateBy(getUserId());
|
orderDetl.setUpdateTime(now);
|
orderDetl.setStatus(1);
|
orderDetl.setQty(0.0D);
|
if (!orderDetlService.insert(orderDetl)) {
|
throw new CoolException("response.save_order_detail_failed");
|
}
|
}
|
}
|
return R.ok("response.order_modify_success");
|
}
|
|
@PostMapping(value = "/order/wrk/trace/auth")
|
@ManagerAuth
|
public R orderWrkTrace(@RequestParam("orderId") Long orderId) {
|
Order order = orderService.selectById(orderId);
|
if (null == order) {
|
return R.error("response.order_not_exist");
|
}
|
// 数量统计
|
double totalQty = 0;
|
double wrkQty = 0;
|
double lackQty = 0;
|
double endQty = 0;
|
List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(orderId);
|
for (OrderDetl orderDetl : orderDetls) {
|
totalQty = totalQty + orderDetl.getAnfme();
|
wrkQty = wrkQty + orderDetl.getWorkQty();
|
endQty = endQty + orderDetl.getQty();
|
double issued = Optional.of(orderDetl.getAnfme() - orderDetl.getWorkQty()).orElse(0.0D);
|
if (issued > 0.0) {
|
List<LocDetl> locDetls = locDetlService.queryStock(orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getOrigin(), null);
|
for (LocDetl locDetl : locDetls) {
|
if (issued > 0) {
|
issued = issued - locDetl.getAnfme();
|
} else {
|
break;
|
}
|
}
|
}
|
if (issued > 0.0) {
|
lackQty = lackQty + issued;
|
}
|
}
|
// 任务追溯
|
List<WrkTraceVo> wrkTraceVos = new ArrayList<>();
|
List<WrkDetl> wrkDetls = wrkDetlService.selectAndLogByOrderNoGroupByMatnrOfSum(order.getOrderNo());
|
for (WrkDetl wrkDetl : wrkDetls) {
|
WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", wrkDetl.getWrkNo()).eq("io_time", wrkDetl.getIoTime()));
|
if (wrkMast == null) {
|
WrkMastLog wrkMastLog = wrkMastLogService.selectOne(new EntityWrapper<WrkMastLog>().eq("wrk_no", wrkDetl.getWrkNo()).eq("io_time", wrkDetl.getIoTime()));
|
if (wrkMastLog.getIoType()==103){
|
wrkMastLog = wrkMastLogService.selectOne(new EntityWrapper<WrkMastLog>().eq("wrk_no", wrkDetl.getWrkNo()).eq("io_time", wrkDetl.getIoTime()).eq("io_type",53));
|
}
|
if (wrkMastLog != null) {
|
wrkMast = new WrkMast();
|
BeanUtils.copyProperties(wrkMastLog, wrkMast);
|
} else {
|
continue;
|
}
|
}
|
boolean exist = false;
|
for (WrkTraceVo vo : wrkTraceVos) {
|
if (vo.getWrkNo().equals(wrkMast.getWrkNo()) && vo.getIoTimeStr().equals(DateUtils.convert(wrkMast.getIoTime()))) {
|
vo.getWrkDetls().add(wrkDetl);
|
exist = true;
|
}
|
}
|
if (!exist) {
|
WrkTraceVo vo = new WrkTraceVo(wrkMast.getWrkNo(), DateUtils.convert(wrkMast.getIoTime()), wrkMast, wrkDetl);
|
wrkTraceVos.add(vo);
|
}
|
}
|
if (!Cools.isEmpty(wrkTraceVos) && wrkTraceVos.size() > 1) {
|
wrkTraceVos.sort((o1, o2) -> (int) (o2.getWrkMast().getIoTime().getTime() - o1.getWrkMast().getIoTime().getTime()));
|
}
|
|
R r = R.ok();
|
r.put("data", Cools
|
.add("list", wrkTraceVos)
|
.add("orderNo", order.getOrderNo())
|
.add("totalQty", totalQty)
|
.add("wrkQty", wrkQty+endQty)
|
.add("lackQty", lackQty)
|
.add("endQty",endQty));
|
return r;
|
}
|
|
|
// ------------------------------------------------------------------------------------------------
|
|
@RequestMapping(value = "/order/{id}/auth")
|
@ManagerAuth
|
public R get(@PathVariable("id") String id) {
|
return R.ok(orderService.selectById(String.valueOf(id)));
|
}
|
|
@RequestMapping(value = "/order/list/auth")
|
@ManagerAuth
|
public R list(@RequestParam(defaultValue = "1")Integer curr,
|
@RequestParam(defaultValue = "10")Integer limit,
|
@RequestParam(required = false)String orderByField,
|
@RequestParam(required = false)String orderByType,
|
@RequestParam Map<String, Object> param){
|
EntityWrapper<Order> wrapper = new EntityWrapper<>();
|
excludeTrash(param);
|
convert(param, wrapper);
|
if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
|
return R.ok(orderService.selectPage(new Page<>(curr, limit), wrapper));
|
}
|
|
private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
|
for (Map.Entry<String, Object> entry : map.entrySet()){
|
String val = String.valueOf(entry.getValue());
|
if (val.contains(RANGE_TIME_LINK)){
|
String[] dates = val.split(RANGE_TIME_LINK);
|
wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
|
wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
|
} else {
|
wrapper.like(entry.getKey(), val);
|
}
|
}
|
}
|
|
@RequestMapping(value = "/order/update/auth")
|
@ManagerAuth
|
public R update(Order order){
|
if (Cools.isEmpty(order) || null == order.getId()){
|
return R.error();
|
}
|
|
//订单完结前，判断是否存在作业中数据，存在则不能完结
|
if(order.getSettle() == 4){
|
int wrkCount = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("order_no",order.getOrderNo()));
|
int pakinCount = waitPakinService.selectCount(new EntityWrapper<WaitPakin>().eq("order_no",order.getOrderNo()));
|
if (wrkCount > 0 || pakinCount > 0) {
|
throw new CoolException("response.existing_working_data_cannot_complete");
|
}
|
}
|
|
order.setUpdateBy(getUserId());
|
order.setUpdateTime(new Date());
|
if (!orderService.updateById(order)) {
|
throw new CoolException("response.modify_order_failed");
|
}
|
return R.ok("response.order_update_success");
|
}
|
|
@RequestMapping(value = "/order/delete/auth")
|
@ManagerAuth(memo = "response.manual_delete_order")
|
@Transactional
|
public R delete(@RequestParam Long orderId){
|
Order order = orderService.selectById(orderId);
|
if (order != null) {
|
DocType docType = docTypeService.selectById(order.getDocType());
|
String docName = docType != null ? String.valueOf(docType.getDocName()) : "";
|
if (!Cools.isEmpty(docName)) {
|
String dn = docName.toLowerCase();
|
if (dn.contains("inspection") || dn.contains("检验")) {
|
locDetlService.clearInspectNumberByOrderNo(order.getOrderNo());
|
}
|
}
|
}
|
orderService.remove(orderId);
|
// Order order = orderService.selectById(orderId);
|
// if (order != null) {
|
// order.setStatus(0);
|
// }
|
// if (!orderService.updateById(order)) {
|
// throw new CoolException("删除订单失败");
|
// }
|
// orderDetlService.modifyStatus(orderId, 0);
|
return R.ok("response.order_delete_success");
|
}
|
|
@RequestMapping(value = "/order/export/auth")
|
@ManagerAuth
|
public R export(@RequestBody JSONObject param){
|
EntityWrapper<Order> wrapper = new EntityWrapper<>();
|
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
|
Map<String, Object> map = excludeTrash(param.getJSONObject("order"));
|
convert(map, wrapper);
|
List<Order> list = orderService.selectList(wrapper);
|
return R.ok(exportSupport(list, fields));
|
}
|
|
@RequestMapping(value = "/orderQuery/auth")
|
@ManagerAuth
|
public R query(String condition) {
|
EntityWrapper<Order> wrapper = new EntityWrapper<>();
|
wrapper.like("id", condition);
|
Page<Order> page = orderService.selectPage(new Page<>(0, 10), wrapper);
|
List<Map<String, Object>> result = new ArrayList<>();
|
for (Order order : page.getRecords()){
|
Map<String, Object> map = new HashMap<>();
|
map.put("id", order.getId());
|
map.put("value", order.getOrderNo());
|
result.add(map);
|
}
|
return R.ok(result);
|
}
|
|
@RequestMapping(value = "/order/check/column/auth")
|
@ManagerAuth
|
public R query(@RequestBody JSONObject param) {
|
Wrapper<Order> wrapper = new EntityWrapper<Order>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
|
if (null != orderService.selectOne(wrapper)){
|
R r = R.parse(BaseRes.REPEAT);
|
r.put("data", getComment(Order.class, String.valueOf(param.get("key"))));
|
return r;
|
}
|
return R.ok();
|
}
|
|
@RequestMapping(value = "/order/checkInspection/auth")
|
@ManagerAuth
|
@Transactional
|
public R checkInspection(@RequestParam String orderNo, Integer inspectNumber) {
|
if (orderNo == null || orderNo.isEmpty()) {
|
return R.error("response.order_no_is_empty");
|
}
|
|
// 1. 更新库存明细中的检验状态
|
locDetlService.updateInspectionStatus(orderNo, inspectNumber);
|
|
// 2. 更新单据主档状态为已完成 (settle = 4)
|
Order order = orderService.selectByNo(orderNo);
|
if (order != null) {
|
order.setSettle(4L);
|
orderService.updateById(order);
|
}
|
|
return R.ok("response.operation_success");
|
}
|
|
}
|
