opt: 工单

lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/material/service/dao/mapper/MdBaseMaterialMapper.java

@@ -14,7 +14,7 @@ public interface MdBaseMaterialMapper extends BaseMapper<MdBaseMaterial> {
     /**
      * 根据库存获取物料信息
      * @param pages
-     * @param whereJson
+     * @param query
      * @return
      */
     IPage<MdBaseMaterial> queryByInventory(IPage<MdBaseMaterial> pages, MdBaseMaterialQuery query);

lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/material/service/dao/mapper/MdBaseMaterialMapper.xml

@@ -33,6 +33,8 @@
               CTE.material_code,
               CTE.material_name,
               CTE.material_spec,
+              CTE.material_model,
+              CTE.pack_method,
               CTE.total_material_qty,
               CTE.half_material_code,
               CTE.raw_material_code,

lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java

@@ -438,7 +438,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
      */
     @Override
     public ApplyTaskResponse applyLabelling(JSONObject param) {
-        // 木托盘号##物料编码##数量##吨量（单重X数量）##生产日期##客户名称##订单号
+        // 木托盘号(4)##物料编码(12)##数量(2-3)##吨量（单重X数量）##生产日期(11)##客户名称##订单号(12)
         String requestNo = param.getString("requestNo");
         ApplyTaskRequest baseRequest = param.toJavaObject(ApplyTaskRequest.class);
         if (baseRequest.getVehicle_code() == null) {

lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/controller/PdmBdWorkorderController.java

@@ -1,5 +1,6 @@
 package org.nl.wms.pdm.workorder.controller;
 
+import cn.dev33.satoken.annotation.SaIgnore;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
@@ -69,6 +70,7 @@ public class PdmBdWorkorderController {
     @PostMapping
     @Log("新增工单管理")
     @ApiOperation("新增工单管理")
+    @SaIgnore
     //@SaCheckPermission("@el.check('pdmBdWorkorder:add')")
     public ResponseEntity<Object> create(@Validated @RequestBody PdmBdWorkorder entity){
         pdmBdWorkorderService.create(entity);