Merge remote-tracking branch 'origin/master'

Houjie

2025-05-26 1ae9b57657199f46affc9083c39681f1ec934e3f

 lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/OutboundOrderController.java

@@ -1,5 +1,9 @@
package org.jeecg.modules.tms.controller;

import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.parser.Feature;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import org.jeecg.common.system.query.QueryGenerator;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -7,6 +11,9 @@
import lombok.extern.slf4j.Slf4j;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.util.TranslateDictTextUtils;
import org.jeecg.modules.tms.entity.dto.OutBoundOrderFlowDto;
import org.jeecg.modules.tms.entity.dto.OutBoundRequestDto;
import org.jeecg.modules.tms.entity.dto.OutboundOrderAndDetailDto;
import org.jeecg.modules.tms.entity.vo.OutboundDetailVo;
import org.jeecg.modules.tms.enums.OutBillStatus;
@@ -56,6 +63,13 @@
   @Autowired
   private IOutboundDetailService outboundDetailService;

   @Autowired
   private ObjectMapper objectMapper;

   @Autowired
   private TranslateDictTextUtils translateDictTextUtils;



   /*---------------------------------主表处理-begin-------------------------------------*/

@@ -79,6 +93,28 @@
      Page<OutboundOrder> page = new Page<OutboundOrder>(pageNo, pageSize);
      IPage<OutboundOrder> pageList = outboundOrderService.queryPageList(page, parameterMap);
      return Result.OK(pageList);
   }

   @ApiOperation(value="tms_outbound_order-通过id查询", notes="tms_outbound_order-通过id查询")
   @GetMapping(value = "/queryById")
   public Result<?> queryById(@RequestParam("id") String id) {
      OutboundOrder outboundOrder = outboundOrderService.getById(id);
      if (outboundOrder == null) {
         return Result.error("未找到对应数据");
      }
        try {
            String jsonStr = objectMapper.writeValueAsString(outboundOrder);
         JSONObject item = JSONObject.parseObject(jsonStr, Feature.OrderedField);
         translateDictTextUtils.translateField("outStorehouseType", outboundOrder.getOutStorehouseType(), item, "out_storehouse_type");
         translateDictTextUtils.translateField("handler", outboundOrder.getHandler(), item, "sys_user,realname,id");
         translateDictTextUtils.translateField("orderStatus", outboundOrder.getOrderStatus(), item, "out_bill_status");
         translateDictTextUtils.translateField("outStatus", outboundOrder.getOutStatus(), item, "out_storehouse_status");
         translateDictTextUtils.translateField("createBy", outboundOrder.getCreateBy(), item, "sys_user,realname,username");
         translateDictTextUtils.translateField("updateBy", outboundOrder.getUpdateBy(), item, "sys_user,realname,username");
         return Result.OK(item);
        } catch (JsonProcessingException e) {
         return Result.error("数据转译失败！");
        }
   }

   /**
@@ -130,14 +166,26 @@
   @ApiOperation(value="tms_outbound_order-提交出库申请单", notes="tms_outbound_order-提交出库申请单")
   @GetMapping(value = "/submit")
   public Result<String> submit(@RequestParam(name="id") String id) {
      OutboundOrder order = new OutboundOrder();
      order.setId(id);
      order.setOrderStatus(OutBillStatus.SUBMITTED.getValue());
      outboundOrderService.updateById(order);
      //开启流程
      outboundOrderService.submit(id);
      return Result.OK("提交成功!");
   }

    @AutoLog(value = "审批流程")
    @ApiOperation(value = "出库申请单-审批流程", notes = "出库申请单-审批流程")
    @PostMapping("/approval")
    public Result<?> approval(@RequestBody OutBoundOrderFlowDto outBoundOrderFlowDto) {
      outboundOrderService.approvalProcess(outBoundOrderFlowDto);
      return Result.OK("操作成功");
    }

    @AutoLog(value = "申请单方式出库")
    @ApiOperation(value = "申请单方式出库", notes = "申请单方式出库")
    @PostMapping(value = "/outBound")
    public Result<?> outBound(@RequestBody List<OutBoundRequestDto> outBoundRequestList) {
      outboundOrderService.outBound(outBoundRequestList);
      return Result.OK("出库成功");
    }

    /**
     * 通过id删除
     * @param id