代码更新

mes/hd/nladmin-system/src/main/java/org/nl/pda/st/out/service/impl/HandPFOutIvtServiceImpl.java

@@ -410,7 +410,7 @@ public class HandPFOutIvtServiceImpl implements HandPFOutIvtService {
     @Override
     public Map<String, Object> confirmOutStore2(Map<String, String> jsonObject) {
         String input_optid = MapUtil.getStr(jsonObject, "input_optid");
-        String input_optname = MapUtil.getStr(jsonObject, "input_optid");
+        String input_optname = MapUtil.getStr(jsonObject, "input_optname");
         Long currentUserId = SecurityUtils.getCurrentUserId();
         UserDto userDto = userService.findById(currentUserId);
         // 仓位属性表【ST_IVT_StructAttr】
@@ -556,8 +556,8 @@ public class HandPFOutIvtServiceImpl implements HandPFOutIvtService {
         invrow.put("input_optid", input_optid);
         invrow.put("input_optname", input_optname);
         invrow.put("input_time", now);
-        invrow.put("update_optid", currentUserId);
+        invrow.put("update_optid", input_optid);
-        invrow.put("update_optname", userDto.getNickName());
+        invrow.put("update_optname", input_optname);
         invrow.put("update_time", now);
         invrow.put("dis_optid", currentUserId);
         invrow.put("dis_optname", userDto.getNickName());

mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/FlourworkServiceImpl.java

@@ -59,6 +59,7 @@ public class FlourworkServiceImpl implements FlourworkService {
     public Map<String, Object> queryAll(Map whereJson, Pageable page) {
         String is_all = MapUtil.getStr(whereJson, "is_all");
         String biz_date = MapUtil.getStr(whereJson, "biz_date");
+        String pcsn = MapUtil.getStr(whereJson, "pcsn");
         HashMap<String, String> map = new HashMap<>();
         map.put("flag", "1");
         map.put("device_id", MapUtil.getStr(whereJson, "device_id"));
@@ -68,6 +69,7 @@ public class FlourworkServiceImpl implements FlourworkService {
             map.put("status", is_all);
         }
         if (StrUtil.equals(is_all, "0")) map.put("status", "99");
+        if (ObjectUtil.isNotEmpty(pcsn)) map.put("pcsn", "%"+pcsn+"%");
         JSONObject json = WQL.getWO("QPDM_BI_FORMULA01").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "fMst.status,task.start_time,fMst.bucket_type ASC");
         return json;
     }

mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/wql/QPDM_BI_FORMULA01.wql

@@ -16,6 +16,7 @@
 	输入.flag					        TYPEAS s_string
 	输入.biz_date					    TYPEAS s_string
 	输入.device_id					    TYPEAS s_string
+	输入.pcsn					        TYPEAS s_string
 	输入.status					        TYPEAS s_string
 	输入.formula_id					    TYPEAS s_string
 	输入.formuladtl_id					TYPEAS s_string
@@ -87,6 +88,7 @@
 			    fMst.end_name,
 			    der.workordercard_id,
 			    device.device_code,
+			    device.device_name,
 
 			    device.device_id,
 			    fMst.formula_id,
@@ -113,6 +115,10 @@
                          task.device_id = 输入.device_id
                 ENDOPTION
 
+                OPTION 输入.pcsn <> ""
+                         fMst.pcsn like 输入.pcsn
+                ENDOPTION
+
                 OPTION 输入.status <> "1"
                          fMst.status <> 输入.status
                 ENDOPTION

mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/service/impl/ProductionDayQueryServiceImpl.java

@@ -56,7 +56,7 @@ public class ProductionDayQueryServiceImpl implements ProductionDayQueryService
             JSONArray arr = WQL.getWO("QP_WORKTASKJOB01").addParam("flag", "3").addParam("workorder_id", workorder_id).process().getResultJSONArray(0);
             for (int j = 0; j < arr.size(); j++) {
                 JSONObject jsonObject = arr.getJSONObject(j);
-                jsonResult.put(jsonObject.getString("workprocedure_id"),jsonObject.getString("end_name"));
+                jsonResult.put(jsonObject.getString("workprocedure_id"),jsonObject.getString("create_name"));
                 jsonResult.put(jsonObject.getString("workprocedure_id") + "planstart_time"+"",jsonObject.getString("planstart_time"));
                 jsonResult.put(jsonObject.getString("workprocedure_id") + "start_time"+"",jsonObject.getString("start_time"));
             }

mes/qd/src/views/wms/pf/flourwork/index.vue

@@ -34,6 +34,18 @@
             </el-select>
           </el-form-item>
 
+          <el-form-item label="批次">
+            <label slot="label">批&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;次:</label>
+            <el-input
+              v-model="query.pcsn"
+              clearable
+              size="mini"
+              placeholder="请输入批次"
+              class="filter-item"
+              @keyup.enter.native="crud.toQuery"
+            />
+          </el-form-item>
+
           <el-form-item label="显示全部" label-width="120px">
             <!--<el-select
               v-model="query.is_all"
@@ -52,6 +64,7 @@
             <el-switch v-model="query.is_all" active-value="1" inactive-value="0" @change="crud.toQuery()"/>
 
           </el-form-item>
+
           <rrOperation />
         </el-form>
       </div>
@@ -103,7 +116,7 @@
         <el-table-column prop="start_name" label="开始人" />
         <el-table-column prop="end_name" label="结束人" />
         <el-table-column prop="workordercard_id" label="工艺指令卡号" min-width="160" show-overflow-tooltip />
-        <el-table-column prop="device_code" label="配粉位" width="120px" show-overflow-tooltip />
+        <el-table-column prop="device_name" label="配粉位" width="120px" show-overflow-tooltip />
       </el-table>
       <!--分页组件-->
       <pagination />

mes/qd/src/views/wms/statistics/productionDayQuery/index.vue

@@ -63,7 +63,6 @@
         v-loading="crud.loading"
         :data="crud.data"
         size="mini"
-        border
         style="width: 100%;"
         @selection-change="crud.selectionChangeHandler"
       >