rev:组盘表字段移到点位表

acs/nladmin-system/nlsso-server/src/main/resources/config/application.yml

@@ -2,7 +2,7 @@ spring:
   freemarker:
     check-template-location: false
   profiles:
-    active: prod
+    active: dev
   jackson:
     time-zone: GMT+8
   data:
@@ -88,6 +88,10 @@ mybatis-plus:
   global-config:
     db-config:
       id-type: INPUT
+    banner: false
 lucene:
   index:
     path: D:\lucene\index
+tlog:
+  enable-invoke-time-print: true
+  pattern: "[$preApp][$preIp][$spanId][$traceId]"

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

@@ -152,6 +152,19 @@ public class SchBasePoint implements Serializable {
     @ApiModelProperty(value = "放货等待点")
     private String next_wait_point;
 
+
+    @ApiModelProperty(value = "回温时间(小时)")
+    private Integer standing_time;
+
+    @ApiModelProperty(value = "物料重量")
+    private BigDecimal material_weight;
+    @ApiModelProperty(value = "批次")
+    private String pcsn;
+
+    @ApiModelProperty(value = "入库时间")
+    private String instorage_time;
+
+
 //    @ApiModelProperty(value = "物料名称")
 //    private String product_description;
 //

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

@@ -216,6 +216,9 @@ public class YCLCKTask extends AbstractTask {
             endPointObj.setVehicle_code2(taskObj.getVehicle_code2());
             endPointObj.setVehicle_qty(1);
             endPointObj.setUpdate_time(DateUtil.now());
+            endPointObj.setStanding_time(Integer.valueOf(extGroupData.getString("time")));
+            endPointObj.setPcsn(extGroupData.getString("batch"));
+            endPointObj.setInstorage_time(DateUtil.now());
             pointService.update(endPointObj);
             // 起点清空
             startPointObj.setVehicle_code("");

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

@@ -200,6 +200,8 @@ public class YCLRKTask extends AbstractTask {
             endPointObj.setVehicle_code2(taskObj.getVehicle_code2());
             endPointObj.setUpdate_time(DateUtil.now());
             endPointObj.setVehicle_qty(1);
+            endPointObj.setMaterial_weight(extGroupData.getBigDecimal("weight"));
+            endPointObj.setInstorage_time(DateUtil.now());
             pointService.update(endPointObj);
             // 要把数据存到组盘表 -> 改造公共方法，返回id
             //组盘表需要关联外部mes晶棒数据，一对多

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

@@ -41,10 +41,16 @@
     </update>
 
     <select id="queryByMes" resultType="org.nl.wms.mes.domain.QPMES118ResponseBody">
-        select p.region_code as WhaCode,p.point_code as WhlCode,p.vehicle_code as ParentPalletSN,p.vehicle_code2 as PalletSN,v.material_id as ProductName,v.material_weight as Qty,DATE_FORMAT(v.update_time, '%Y-%m-%d') as WorkDate,v.remark as CustomerName
+        SELECT
-        from sch_base_point p
+            p.region_code AS WhaCode,
-                 LEFT JOIN sch_base_vehiclematerialgroup v
+            p.point_code AS WhlCode,
-                           on p.vehicle_code2=v.vehicle_code
+            p.vehicle_code AS ParentPalletSN,
-        where p.region_code in('YL','YLHC','HW','HWK');
+            p.vehicle_code2 AS PalletSN,
+            p.material_weight AS Qty,
+            DATE_FORMAT( p.update_time, '%Y-%m-%d' ) AS WorkDate
+        FROM
+            sch_base_point p
+        WHERE
+            p.region_code IN ( 'YL', 'YLHC', 'HW', 'HWK' );
     </select>
 </mapper>

lms/nladmin-ui/src/views/wms/pdm/workerordertwo/PointDetailDialog.vue

@@ -64,21 +64,22 @@
       </span> -->
     <el-button
       type="primary"
-      @click="submitSelectedRows">
+      @click="submitSelectedRows"
+    >
       原材料出库
     </el-button>
   </el-dialog>
-  </template>
+</template>
 
-  <script>
+<script>
 
-  import CRUD, { header, presenter } from '@crud/crud'
+import CRUD, { header, presenter } from '@crud/crud'
-  import rrOperation from '@crud/RR.operation'
+import rrOperation from '@crud/RR.operation'
-  import pagination from '@crud/Pagination'
+import pagination from '@crud/Pagination'
-  import '@riophae/vue-treeselect/dist/vue-treeselect.css'
+import '@riophae/vue-treeselect/dist/vue-treeselect.css'
 import { mount } from 'sortablejs'
 
-  export default {
+export default {
   name: 'WorkOrderDetailDialog',
   components: { rrOperation, pagination },
   dicts: ['is_used', 'vehicle_type'],
@@ -98,7 +99,7 @@ import { mount } from 'sortablejs'
     productname: {
       type: String,
       default: ''
-    },workorder_code: {
+    }, workorderCode: {
       type: String,
       default: ''
     }
@@ -118,13 +119,13 @@ import { mount } from 'sortablejs'
     },
     productname(newVal) {
       // 监听传递的值变化，并在变化时执行赋值操作
-      this.query.productname = newVal;
+      this.query.productname = newVal
-      this.executeQuery();
+      this.executeQuery()
     },
     workorder_code(newVal) {
       // 监听传递的值变化，并在变化时执行赋值操作
-      this.query.workorder_code=newVal
+      this.query.workorder_code = newVal
-      this.workorder_code = newVal;
+      this.workorder_code = newVal
     }
   },
   methods: {
@@ -164,17 +165,17 @@ import { mount } from 'sortablejs'
       this.crud.resetQuery(false)
       this.$emit('update:dialogShow', false)
       this.$emit('tableChanged', this.rows)
-      },executeQuery() {
+    }, executeQuery() {
-        this.crud.toQuery();
+      this.crud.toQuery()
-      },submitSelectedRows() {
+    }, submitSelectedRows() {
-      const selectedRows = this.$refs.table.selection;
+      const selectedRows = this.$refs.table.selection
       if (selectedRows.length === 0) {
-        this.$message.error('请至少选择一行数据');
+        this.$message.error('请至少选择一行数据')
-        return;
+        return
       }
 
       // 获取选中行的 point_code
-    const pointCodes = selectedRows.map(row => row.point_code);
+      const pointCodes = selectedRows.map(row => row.point_code)
 
       // 弹出输入回温时间和回温模式的对话框
       this.$prompt('请输入回温时间', '提示', {
@@ -195,36 +196,35 @@ import { mount } from 'sortablejs'
             workorder_code: this.workorder_code // 使用workorder_code属性
           }).then(response => {
             // 提交成功处理
-            this.$message.success('提交成功！');
+            this.$message.success('提交成功！')
             // 关闭当前对话框
-        this.dialogVisible = false;
+            this.dialogVisible = false
           }).catch(error => {
             // 提交失败处理
-            this.$message.error('提交失败，请重试');
+            this.$message.error('提交失败，请重试')
-          });
+          })
         }).catch(() => {
           // 用户点击了取消按钮
           this.$message({
             type: 'info',
             message: '已取消提交操作'
-          });
+          })
-        });
+        })
       }).catch(() => {
         // 用户点击了取消按钮
         this.$message({
           type: 'info',
           message: '已取消提交操作'
-        });
+        })
-      });
+      })
     }
   }
 
-  }
+}
-  </script>
+</script>
   <style rel="stylesheet/scss" lang="scss" scoped>
     ::v-deep .el-dialog__body {
       padding-top: 0px;
     }
   </style>
 
-