fix

lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/secutiry/MobileAuthorizationController.java

@@ -42,17 +42,16 @@ import java.util.Map;
  */
 @Slf4j
 @RestController
-@RequestMapping("/api/pda")
+@RequestMapping("/mobile/auth")
 @Api(tags = "手持：系统授权接口")
 public class MobileAuthorizationController {
     @Autowired
     private ISysUserService userService;
     @Autowired
     private ISysRoleService roleService;
-    @Autowired
-    private ISchBasePointService pointService;
+
     @ApiOperation("登录授权")
-    @PostMapping(value = "/handlogin")
+    @PostMapping(value = "/login")
     @SaIgnore
     public ResponseEntity<Object> login(@Validated @RequestBody AuthUserDto authUser, HttpServletRequest request) throws Exception {
         // 密码解密 - 前端的加密规则: encrypt（根据实际更改）
@@ -97,15 +96,4 @@ public class MobileAuthorizationController {
         return ResponseEntity.ok(authInfo);
     }
 
-    @PostMapping("/point")
-    @Log("查询设备编号及状态")
-    @ApiOperation("查询设备编号及状态")
-    @SaIgnore
-    //@PreAuthorize("@el.check('sect:list')")
-    //@RequestBody JSONObject json
-    public ResponseEntity<Object> queryPoint(@RequestBody Map<String, String> whereJson) {
-        SchBasePoint region = new SchBasePoint();
-        region.setRegion_code(whereJson.get("region_code"));
-        return new ResponseEntity<>(pointService.getPointList(region), HttpStatus.OK);
-    }
 }

lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/controller/PdaController.java

@@ -8,6 +8,9 @@ import lombok.extern.slf4j.Slf4j;
 import org.nl.common.logging.annotation.Log;
 import org.nl.wms.pda.service.PdaService;
 import org.nl.wms.pda.service.dao.vo.PdaResponseVo;
+import org.nl.wms.sch.point.service.ISchBasePointService;
+import org.nl.wms.sch.point.service.dao.SchBasePoint;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -18,6 +21,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
+import java.util.Map;
 
 /**
  * @Author: lyd
@@ -34,6 +38,20 @@ public class PdaController {
 
     @Resource
     private PdaService pdaService;
+    @Autowired
+    private ISchBasePointService pointService;
+
+    @PostMapping("/point")
+    @Log("查询设备编号及状态")
+    @ApiOperation("查询设备编号及状态")
+    @SaIgnore
+    //@PreAuthorize("@el.check('sect:list')")
+    //@RequestBody JSONObject json
+    public ResponseEntity<Object> queryPoint(@RequestBody Map<String, String> whereJson) {
+        SchBasePoint region = new SchBasePoint();
+        region.setRegion_code(whereJson.get("region_code"));
+        return new ResponseEntity<>(pointService.getPointList(region), HttpStatus.OK);
+    }
 
     @PostMapping("/yclrk")
     @Log("原材料入库")

lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/dao/dto/ForcedRestingDto.java

@@ -9,6 +9,6 @@ import lombok.Data;
  */
 @Data
 public class ForcedRestingDto {
-    private Integer stand_time; // 静置时间
+    private Integer stand_time; // 回温时间(小时)
     private String group_id; // 组盘标识
 }

lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/service/dao/PdmBdWorkorder.java

@@ -54,7 +54,7 @@ public class PdmBdWorkorder implements Serializable {
     @ApiModelProperty(value = "实际结束时间")
     private String realproduceend_date;
 
-    @ApiModelProperty(value = "静置时间(分钟)")
+    @ApiModelProperty(value = "回温时间(小时)")
     private Integer standing_time;
 
     @ApiModelProperty(value = "点位编码")

lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/service/dto/PdmBdWorkorderDto.java

@@ -43,7 +43,7 @@ public class PdmBdWorkorderDto implements Serializable {
     /** 实际结束时间 */
     private String realproduceend_date;
 
-    /** 静置时间(分钟) */
+    /** 回温时间(小时) */
     private BigDecimal standing_time;
 
     /** 点位编码 */

lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/dao/SchBaseVehiclematerialgroup.java

@@ -56,7 +56,7 @@ public class SchBaseVehiclematerialgroup implements Serializable {
     @ApiModelProperty(value = "入库时间")
     private String instorage_time;
 
-    @ApiModelProperty(value = "静置时间(分钟)")
+    @ApiModelProperty(value = "回温时间(小时)")
     private Integer standing_time;
 
     @ApiModelProperty(value = "物料数量")

lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/dto/SchBaseVehiclematerialgroupDto.java

@@ -42,7 +42,7 @@ public class SchBaseVehiclematerialgroupDto implements Serializable {
     /** 入库时间 */
     private String instorage_time;
 
-    /** 静置时间(分钟) */
+    /** 回温时间(小时) */
     private BigDecimal standing_time;
 
     /** 物料数量 */

lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/YCLRKTask.java

@@ -171,13 +171,15 @@ public class YCLRKTask extends AbstractTask {
             pointService.update(endPointObj);
             // 要把数据存到组盘表 -> 改造公共方法，返回id
             //组盘表需要关联外部mes晶棒数据，一对多
-            SchBaseVehiclematerialgroup groupEntity = getSchBaseVehiclematerialgroup(taskObj, extGroupData, workorderCode, startPoint, startPointObj);
+            SchBaseVehiclematerialgroup groupEntity = getSchBaseVehiclematerialgroup(taskObj, extGroupData, workorderCode, endPoint, endPointObj);
             groupEntity.setVehicle_code(taskObj.getVehicle_code());
             groupEntity.setVehicle_type("0");
+            groupEntity.setMaterial_weight(extGroupData.getBigDecimal("weight"));
             vehiclematerialgroupService.save(groupEntity);
             groupEntity.setGroup_id(IdUtil.getSnowflake(1, 1).nextIdStr());
             groupEntity.setVehicle_code(taskObj.getVehicle_code2());
             groupEntity.setVehicle_type("1");
+            groupEntity.setMaterial_weight(extGroupData.getBigDecimal("weight"));
             vehiclematerialgroupService.save(groupEntity);
             // 任务完成
             taskObj.setTask_status(TaskStatus.FINISHED.getCode());

lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/mapper/PointMapper.xml

@@ -7,7 +7,7 @@
         FROM
             `sch_base_point` p
         WHERE p.region_code like CONCAT('%', #{regionCode}, '%')
-        and p.is_used = #{point_status} and p.is_used = 1
+        and p.point_status = #{point_status} and p.is_used = 1
         ORDER BY region_code
     </select>
 

lms/nladmin-ui/src/views/wms/basedata/material/index.vue

@@ -54,7 +54,7 @@
           <el-form-item label="物料分类标识">
             <el-input v-model="form.class_id" style="width: 370px;" />
           </el-form-item>
-          <el-form-item label="静置时间(分钟)">
+          <el-form-item label="回温时间(小时)">
             <el-input v-model="form.standing_time" style="width: 370px;" />
           </el-form-item>
           <el-form-item label="车间编码">
@@ -76,7 +76,7 @@
         <el-table-column prop="material_name" label="物料名称 " :min-width="flexWidth('material_name',crud.data,'物料名称 ')" />
         <el-table-column prop="material_spec" label="物料规格" :min-width="flexWidth('material_spec',crud.data,'物料规格')" />
         <el-table-column prop="class_id" label="物料分类标识" :min-width="flexWidth('class_id',crud.data,'物料分类标识')" />
-        <el-table-column prop="standing_time" label="静置时间(分钟)" :min-width="flexWidth('standing_time',crud.data,'静置时间(分钟)')" />
+        <el-table-column prop="standing_time" label="回温时间(小时)" :min-width="flexWidth('standing_time',crud.data,'静置时间(分钟)')" />
         <el-table-column prop="workshop_code" label="车间编码" :min-width="flexWidth('workshop_code',crud.data,'车间编码')" />
         <el-table-column prop="remark" label="备注" :min-width="flexWidth('remark',crud.data,'备注')" />
         <el-table-column prop="is_used" label="是否启用" :min-width="flexWidth('is_used',crud.data,'是否启用')">

lms/nladmin-ui/src/views/wms/pdm/workerorder/index.vue

@@ -188,7 +188,7 @@
           <el-form-item label="设备名称">
             <el-input v-model="form.point_name" style="width: 240px;" disabled />
           </el-form-item>
-          <el-form-item label="静置时间(分钟)" prop="standing_time">
+          <el-form-item label="回温时间(小时)" prop="standing_time">
             <el-input-number
               v-model.number="form.standing_time"
               :min="0"
@@ -296,8 +296,8 @@
         />
         <el-table-column
           prop="standing_time"
-          label="静置时间(分钟)"
-          :min-width="flexWidth('standing_time',crud.data,'静置时间(分钟)')"
+          label="回温时间(小时)"
+          :min-width="flexWidth('standing_time',crud.data,'回温时间(小时)')"
         />
         <el-table-column prop="is_needmove" label="是否自动搬运" :min-width="flexWidth('is_needmove',crud.data,'是否自动搬运')">
           <template slot-scope="scope">

lms/nladmin-ui/src/views/wms/sch/group/MaterialDialog.vue

@@ -58,7 +58,7 @@
       <el-table-column prop="material_name" label="物料名称" width="180" show-overflow-tooltip />
       <el-table-column prop="material_spec" label="物料规格" width="140" />
       <!--      <el-table-column prop="class_name" label="物料分类" width="140" />-->
-      <el-table-column prop="standing_time" label="静置时间（分钟）" width="130px" />
+      <el-table-column prop="standing_time" label="回温时间(小时)" width="130px" />
       <el-table-column prop="update_name" label="修改人" />
       <el-table-column prop="update_time" label="修改时间" width="135" />
     </el-table>

lms/nladmin-ui/src/views/wms/sch/group/index.vue

@@ -127,7 +127,7 @@
           <el-form-item label="批次">
             <el-input v-model="form.pcsn" style="width: 240px;" />
           </el-form-item>
-          <el-form-item label="静置时间(分钟)">
+          <el-form-item label="回温时间(小时)">
             <el-input-number
               v-model.number="form.standing_time"
               :min="1"
@@ -234,11 +234,11 @@
         <el-table-column prop="region_name" label="所属区域" :min-width="flexWidth('region_name',crud.data,'所属区域')" />
         <el-table-column prop="point_code" label="点位编码" :min-width="flexWidth('point_code',crud.data,'点位编码')" />
         <el-table-column prop="point_name" label="点位名称" :min-width="flexWidth('point_name',crud.data,'点位名称')" />
-        <el-table-column prop="is_full" label="是否满托" :min-width="flexWidth('is_full',crud.data,'是否满托')">
+        <!--<el-table-column prop="is_full" label="是否满托" :min-width="flexWidth('is_full',crud.data,'是否满托')">
           <template slot-scope="scope">
             {{ scope.row.is_full?'是':'否' }}
           </template>
-        </el-table-column>
+        </el-table-column>-->
         <el-table-column prop="pcsn" label="批次" :min-width="flexWidth('pcsn',crud.data,'批次')" />
         <el-table-column prop="workorder_code" label="工单编码" :min-width="flexWidth('workorder_code',crud.data,'工单编码')" />
         <el-table-column prop="instorage_time" label="入库时间" :min-width="flexWidth('instorage_time',crud.data,'入库时间')" />
@@ -247,11 +247,11 @@
             {{ dict.label.group_bind_material_status[scope.row.group_bind_material_status] }}
           </template>
         </el-table-column>
-        <el-table-column prop="standing_time" label="静置时间(分钟)" :min-width="flexWidth('standing_time',crud.data,'静置时间(分钟)')" />
-        <el-table-column prop="material_name" label="物料名称" show-overflow-tooltip :min-width="flexWidth('material_qty',crud.data,'物料数量')" />
+        <el-table-column prop="standing_time" label="回温时间(小时)" :min-width="flexWidth('standing_time',crud.data,'静置时间(分钟)')" />
+        <!--<el-table-column prop="material_name" label="物料名称" show-overflow-tooltip :min-width="flexWidth('material_qty',crud.data,'物料数量')" />
         <el-table-column prop="material_code" label="物料编码" show-overflow-tooltip :min-width="flexWidth('material_qty',crud.data,'物料数量')" />
         <el-table-column prop="material_spec" label="物料规格" :min-width="flexWidth('material_qty',crud.data,'物料数量')" />
-        <el-table-column prop="material_qty" label="物料数量" :min-width="flexWidth('material_qty',crud.data,'物料数量')" />
+        <el-table-column prop="material_qty" label="物料数量" :min-width="flexWidth('material_qty',crud.data,'物料数量')" />-->
         <el-table-column prop="material_weight" label="物料重量" :min-width="flexWidth('material_weight',crud.data,'物料重量')" />
         <el-table-column prop="group_number" label="组盘次数" :min-width="flexWidth('group_number',crud.data,'组盘次数')" />
         <el-table-column prop="task_code" label="任务编码" :min-width="flexWidth('task_code',crud.data,'任务编码')" />

lms/nladmin-ui/src/views/wms/sch/material/MaterialDialog.vue

@@ -58,7 +58,7 @@
       <el-table-column prop="material_name" label="物料名称" width="180" show-overflow-tooltip />
       <el-table-column prop="material_spec" label="物料规格" width="140" />
       <!--      <el-table-column prop="class_name" label="物料分类" width="140" />-->
-      <el-table-column prop="standing_time" label="静置时间（分钟）" width="130px" />
+      <el-table-column prop="standing_time" label="回温时间(小时)" width="130px" />
       <el-table-column prop="update_name" label="修改人" />
       <el-table-column prop="update_time" label="修改时间" width="135" />
     </el-table>

lms/nladmin-ui/src/views/wms/sch/point/ViewDialog.vue

@@ -75,7 +75,7 @@
         <el-form-item label="入库时间">
           <el-input v-model="groups.instorage_time" style="width: 200px;" />
         </el-form-item>
-        <el-form-item label="静置时间(分)">
+        <el-form-item label="回温时间(小时)">
           <el-input v-model="groups.standing_time" style="width: 200px;" />
         </el-form-item>
         <el-form-item label="绑定状态">