rev：修复单据更新库存变动逻辑？后续考虑库存变动统一在变动这边做现在只处理记录

wms_pro/hd/nladmin-system/src/main/java/org/nl/common/enums/StatusEnum.java

@@ -34,12 +34,13 @@ public enum StatusEnum {
     IOBILL_TYPE_IN(ForkMap.of("生产入库", "10","inStorageTask", "调拨入库", "11","inStorageTask", "退货入库", "12","inStorageTask","拣选回库", "13","inStorageTask","盘点入库", "14","inStorageTask","托盘入库", "30","inStorageTask")),
     IOBILL_TYPE_OUT(ForkMap.of("销售出库", "20","outStorageTask","生产出库", "21","outStorageTask", "调拨出库", "22","outStorageTask","拣选出库", "23","conveyorOutStorageTask","盘点出库", "24","outStorageTask","出库拣选", "25","toPickPlatformTask","托盘出库", "40","outStorageTask")),
     IOBILL_TYPE_MOVE(ForkMap.of("移库", "50","moveStorageTask")),
+    EXT_TASK_TYPE(ForkMap.of("盘点", "60","moveStorageTask")),
     profit_loss(ForkMap.of("盘亏", "0",null,"盘盈", "1",null,"实盘", "2",null)),
 
     /**
      * 任务类型
       */
-    TASK_TYPE(ForkMap.pushAll(IOBILL_TYPE_IN.code,IOBILL_TYPE_OUT.code,IOBILL_TYPE_MOVE.code)),
+    TASK_TYPE(ForkMap.pushAll(IOBILL_TYPE_IN.code,IOBILL_TYPE_OUT.code,IOBILL_TYPE_MOVE.code,EXT_TASK_TYPE.code)),
 
     ACS_TYPE(ForkMap.of("立库", "10",null
             ,"海柔", "20",null

wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/bsrealstorattr/controller/StIvtBsrealstorattrController.java

@@ -94,6 +94,7 @@ public class StIvtBsrealstorattrController {
         int 层 = config.getInteger("z");
         String sect_code = config.getString("sect_code");
         String stor_code = config.getString("stor_code");
+        String pre = config.getString("pre");
         String now = DateUtil.now();
         ArrayList<StIvtStructattr> list = new ArrayList<>();
         for (int x = 1; x <= 排; x++) {
@@ -103,9 +104,10 @@ public class StIvtBsrealstorattrController {
                     attr.setId(IdUtil.getStringId());
                     attr.setSect_code(sect_code);
                     attr.setStor_code(stor_code);
+                    String nx = (x < 10) ? "0" + x : "" + x;
                     String ny = (y < 10) ? "0" + y : "" + y;
                     String nz = (z < 10) ? "0" + z : "" + z;
-                    attr.setStruct_code("L0"+x+"-"+ny+"-"+nz);
+                    attr.setStruct_code(pre+nx+"-"+ny+"-"+nz);
                     attr.setStruct_name(x+"排"+y+"列"+z+"层");
                     attr.setCreate_id("1");
                     attr.setRow_num(x);

wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/sect/controller/StIvtSectattrController.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import org.nl.common.TableDataInfo;
 import org.nl.common.anno.Log;
 import org.nl.common.domain.entity.PageQuery;
+import org.nl.wms.base_manage.bsrealstorattr.service.IStIvtBsrealstorattrService;
 import org.nl.wms.base_manage.sect.service.IStIvtSectattrService;
 import org.nl.wms.base_manage.sect.service.dao.StIvtSectattr;
 import org.nl.wms.base_manage.sect.service.dto.SectQuery;
@@ -15,6 +16,7 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 
@@ -35,10 +37,12 @@ public class StIvtSectattrController {
      */
     @Autowired
     private IStIvtSectattrService iStIvtSectattrService;
+    @Autowired
+    private IStIvtBsrealstorattrService iStIvtBsrealstorattrService;
 
     @GetMapping
     public ResponseEntity<Object> query(SectQuery query, PageQuery page) {
-        return new ResponseEntity<>(iStIvtSectattrService.pageQuery(query, page), HttpStatus.OK);
+        return new ResponseEntity<>(TableDataInfo.build(iStIvtSectattrService.page(page.build(),query.build())), HttpStatus.OK);
     }
 
     @PostMapping
@@ -55,7 +59,9 @@ public class StIvtSectattrController {
 
     @DeleteMapping
     public ResponseEntity<Object> delete(@RequestBody Long[] ids) {
-        iStIvtSectattrService.deleteAll(ids);
+        if (ids.length>0){
+            iStIvtSectattrService.removeByIds(Arrays.asList(ids));
+        }
         return new ResponseEntity<>(HttpStatus.OK);
     }
 

wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/sect/service/dao/StIvtSectattr.java

@@ -54,7 +54,7 @@ public class StIvtSectattr implements Serializable {
     /**
      * 仓库标识
      */
-    private String stor_id;
+    private String stor_code;
 
     /**
      * 仓库类型

wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/sect/service/dto/SectQuery.java

@@ -5,6 +5,7 @@ import org.nl.common.domain.entity.BaseQuery;
 import org.nl.common.domain.entity.QParam;
 import org.nl.common.enums.QueryTEnum;
 import org.nl.wms.base_manage.bsrealstorattr.service.dao.StIvtBsrealstorattr;
+import org.nl.wms.base_manage.sect.service.dao.StIvtSectattr;
 
 /**
  * 仓库查询条件
@@ -12,7 +13,7 @@ import org.nl.wms.base_manage.bsrealstorattr.service.dao.StIvtBsrealstorattr;
  * @Date 2023/11/10 14:49
  */
 @Data
-public class SectQuery extends BaseQuery<StIvtBsrealstorattr> {
+public class SectQuery extends BaseQuery<StIvtSectattr> {
 
     /**
      * 仓库编码

wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/sect/service/impl/StIvtSectattrServiceImpl.java

@@ -59,7 +59,6 @@ public class StIvtSectattrServiceImpl extends ServiceImpl<StIvtSectattrMapper, S
     }
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
     public void create(StIvtSectattr dao) {
 
         StIvtSectattr isDao = this.getOne(
@@ -80,7 +79,7 @@ public class StIvtSectattrServiceImpl extends ServiceImpl<StIvtSectattrMapper, S
         dao.setUpdate_time(DateUtil.now());
         dao.setCreate_time(DateUtil.now());
 
-        StIvtBsrealstorattr attrDao = iStIvtBsrealstorattrService.getById(dao.getStor_id());
+        StIvtBsrealstorattr attrDao = iStIvtBsrealstorattrService.getOne(new QueryWrapper<StIvtBsrealstorattr>().eq("stor_code",dao.getStor_code()));
         dao.setStor_type(attrDao.getStor_type_scode());
         this.save(dao);
 
@@ -89,18 +88,14 @@ public class StIvtSectattrServiceImpl extends ServiceImpl<StIvtSectattrMapper, S
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void update(StIvtSectattr dao) {
-
         StIvtSectattr isDao = this.getById(dao.getSect_id());
-
         if (isDao == null) {
             throw new BadRequestException("被删除或无权限，操作失败!");
         }
-
         dao.setUpdate_id(SecurityUtils.getCurrentUserId());
         dao.setUpdate_name(SecurityUtils.getCurrentNickName());
         dao.setUpdate_time(DateUtil.now());
-
+        StIvtBsrealstorattr attrDao = iStIvtBsrealstorattrService.getOne(new QueryWrapper<StIvtBsrealstorattr>().eq("stor_code",dao.getStor_code()));
-        StIvtBsrealstorattr attrDao = iStIvtBsrealstorattrService.getById(dao.getStor_id());
         dao.setStor_type(attrDao.getStor_type_scode());
 
         this.updateById(dao);

wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/handler/impl/OutStorageTask.java

@@ -68,7 +68,7 @@ public class OutStorageTask extends AbstractTask {
             throw new BadRequestException("创建任务失败:方法请求参数不能为空");
         }
         List<SchBaseTask> list = taskService.list(new QueryWrapper<SchBaseTask>().eq("vehicle_code", vehicle_code)
-                .ne("status", StatusEnum.FORM_STATUS.code("完成")));
+                .lt("status", StatusEnum.FORM_STATUS.code("完成")));
         if (!CollectionUtils.isEmpty(list)){
             throw new BadRequestException("当前载具存在任务:"+list.stream().map(SchBaseTask::getTask_code).collect(Collectors.joining(",")));
         }

wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/engine/behavior/impl/ExecuteFlowActivityBehavior.java

@@ -45,24 +45,31 @@ public class ExecuteFlowActivityBehavior extends FlowNodeActivityBehavior<JSONOb
         ExecuteFlow.DataSourceEnum dataSource = executeFlow.getDataSource();
         switch (dataSource){
             case FLOWNODE:
-                sourceData = one.getForm_data().getJSONObject("t");
+                sourceData = one.getForm_data();
                 break;
             case DATASORUCE:
                 PmFormData formData = iPmFormDataService.getOne(new QueryWrapper<PmFormData>()
                         .eq("id", one.getForm_id()).eq("form_type", one.getForm_type()));
-                sourceData = (JSONObject) JSON.toJSON(formData);
+                JSONObject jsonObject = new JSONObject();
+                jsonObject.put("t", JSON.toJSON(formData));
+                jsonObject.put("form_type",formData.getForm_type());
+                jsonObject.put("form_id",formData.getId());
+                sourceData = jsonObject;
                 break;
             default:
                 throw new IllegalStateException("Unexpected value: " + dataSource);
         }
         String skipExpression = executeFlow.getSkipExpression();
         if (StringUtils.isNotEmpty(skipExpression)) {
-            Boolean parse = SpelUtil.parse(sourceData, skipExpression, Boolean.class);
+            Boolean parse = SpelUtil.parse(sourceData.getJSONObject("t"), skipExpression, Boolean.class);
             if (!parse){
                 throw new BadRequestException("当前中转节点数据校验不通过"+skipExpression+",无法跳转到下个节点");
             }
         }
         //处理流程线：将结果值封装
+        entity.setT(sourceData);
+        entity.setForm_id(one.getForm_id());
+        entity.setForm_type(one.getForm_type());
         super.execute(entity);
     }
 

wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/engine/behavior/impl/StartEventActivityBehavior.java

@@ -3,6 +3,7 @@ package org.nl.wms.flow_manage.flow.framework.engine.behavior.impl;
 import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import org.apache.commons.lang3.StringUtils;
 import org.nl.common.domain.exception.BadRequestException;
 import org.nl.common.enums.StatusEnum;
@@ -88,7 +89,11 @@ public class StartEventActivityBehavior extends FlowNodeActivityBehavior {
             execution.setCreate_time(DateUtil.now());
             execution.setStatus(StatusEnum.FLOW_STATUS.code("启动"));
         iActRuExecutionService.save(execution);
-
+        if (StringUtils.isNotEmpty(entity.getParent_id())){
+            iActRuExecutionService.update(new UpdateWrapper<ActRuExecution>()
+                    .set("has",true)
+                    .eq("proc_inst_id",entity.getParent_id()));
+        }
         entity.setProc_inst_id(execution.getProc_inst_id());
 
     }

wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/process/nodeType/excess/impl/MappingHandler.java

@@ -4,8 +4,11 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.google.common.cache.Cache;
+import com.google.common.cache.CacheBuilder;
 import com.google.common.collect.Lists;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.queue.CircularFifoQueue;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.ss.formula.functions.T;
 import org.nl.common.domain.exception.BadRequestException;
@@ -17,9 +20,11 @@ import org.nl.wms.flow_manage.flow.framework.entity.ExecutionEntity;
 import org.nl.wms.flow_manage.flow.framework.process.nodeType.TypeHandler;
 import org.nl.wms.pm_manage.form_data.service.dto.PmFormDataDto;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.cache.CacheProperties;
 import org.springframework.stereotype.Service;
 
 import java.util.*;
+import java.util.concurrent.ConcurrentLinkedQueue;
 
 /*
  * @author ZZQ
@@ -34,7 +39,6 @@ public class MappingHandler extends TypeHandler<JSONObject, JSONObject> {
     public JSONObject handler(List<String> param, JSONObject data, BmFormStruc form_struc) {
         log.info("映射信息:数据:{},映射关系:{},目标表结构:{}",data.toJSONString(),param.toString(),form_struc.getForm_type()+"_"+form_struc.getForm_param().toJSONString());
         JSONObject resultT = new JSONObject();
-
         JSONObject mapping = JSONObject.parseObject(param.size()==1?param.get(0):param.remove(0));
         JSONObject sourceFormData = new JSONObject(data.getJSONObject("t"));
         //数据平铺

wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/classprocessimpl/StorageChangesProcessHandler.java

@@ -66,12 +66,11 @@ public class StorageChangesProcessHandler implements ClassProcess {
             //基于单据变动
             Map<String, String> spelMap = new HashMap<>();
             Map<String, String> valueMap = new HashMap<>();
+           // "start_struct_code","end_struct_code","change_qty"
             for (String base_field : Base_Fields) {
-                String skip = param.getString("base_field");
+                String skip = param.getString(base_field);
-                if (skip.contains("#M")){
+                if (StringUtils.isNotEmpty(skip)){
-                    spelMap.put(base_field,skip);
+                    (skip.contains("#M") ? spelMap : valueMap).put(base_field,skip);
-                }else {
-                    valueMap.put(base_field,skip);
                 }
             }
             if (!CollectionUtils.isEmpty(spelMap)){
@@ -80,12 +79,12 @@ public class StorageChangesProcessHandler implements ClassProcess {
             }
             String start_struct_code = valueMap.get("start_struct_code");
             String end_struct_code = valueMap.get("end_struct_code");
-            String change_qty = StringUtils.isEmpty(valueMap.get("change_qty"))?null:valueMap.get("change_qty");
+            BigDecimal change_qty = StringUtils.isEmpty(valueMap.get("change_qty"))?null:new BigDecimal(valueMap.get("change_qty"));
             if (StringUtils.isNotEmpty(start_struct_code)){
-                iStIvtStructattrService.changeStruct(start_struct_code,vehicle_code,param.getString("task_type"), new BigDecimal(change_qty),Boolean.FALSE);
+                iStIvtStructattrService.changeStruct(start_struct_code,vehicle_code,param.getString("task_type"), change_qty,Boolean.FALSE);
             }
             if (StringUtils.isNotEmpty(end_struct_code)){
-                iStIvtStructattrService.changeStruct(end_struct_code,vehicle_code,param.getString("task_type"), new BigDecimal(change_qty),Boolean.TRUE);
+                iStIvtStructattrService.changeStruct(end_struct_code,vehicle_code,param.getString("task_type"), change_qty,change_qty.intValue()<0?Boolean.FALSE:Boolean.TRUE);
             }
         }
         return from;

wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/execution/dao/ActRuExecution.java

@@ -39,6 +39,10 @@ public class ActRuExecution implements Serializable {
      * 父流程id
      */
     private String parent_id;
+    /**
+     * 是否含有子流程
+     */
+    private Boolean has;
 
     /**
      * 当前实例对应版本的部署id

wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/execution/impl/ActRuExecutionServiceImpl.java

@@ -50,8 +50,8 @@ public class ActRuExecutionServiceImpl extends ServiceImpl<ActRuExecutionMapper,
         QueryWrapper<ActRuExecution> build = (QueryWrapper) query.build();
         build.isNull("parent_id");
         Page<ActRuExecution> executionPage = this.page(page.build(), build);
-        List<ActRuExecution> records = executionPage.getRecords();
+//        List<ActRuExecution> records = executionPage.getRecords();
-        this.findChildren(records);
+//        this.findChildren(records);
         return TableDataInfo.build(executionPage);
     }
 

wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/checkStorage/controller/CheckController.java

@@ -95,16 +95,13 @@ public class CheckController {
     @Log("盘点完成")
     public ResponseEntity<Object> checkFinish(@RequestBody JSONObject param) {
         //TODO:明细校验
-        PmFormData pmFormData = param.toJavaObject(PmFormData.class);
+        checkStorageService.checkFinish(param);
-        iPmFormDataService.update(new UpdateWrapper<PmFormData>()
-                .set("status", StatusEnum.FORM_STATUS.code("已分配"))
-                .set("form_data",param.getJSONObject("form_data").toJSONString())
-                 .eq("id",param.getString("id")));
         return new ResponseEntity<>(HttpStatus.OK);
     }
 
 
     @DeleteMapping()
+    @Log("删除盘点单")
     public ResponseEntity<Object> delete(@RequestBody String[] ids) {
         checkStorageService.delete(ids);
         return new ResponseEntity<>(HttpStatus.OK);

wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/checkStorage/service/CheckStorageService.java

@@ -3,15 +3,18 @@ package org.nl.wms.stor_manage.checkStorage.service;
 import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import org.apache.commons.lang3.StringUtils;
 import org.nl.common.domain.exception.BadRequestException;
 import org.nl.common.enums.StatusEnum;
+import org.nl.common.function.PermeateFunction;
 import org.nl.common.publish.BussEventMulticaster;
 import org.nl.common.utils.CodeUtil;
 import org.nl.common.utils.IdUtil;
 import org.nl.common.utils.SecurityUtils;
 import org.nl.wms.flow_manage.flow.framework.entity.ExecutionDto;
+import org.nl.wms.flow_manage.monitor.event.FlowContinueEvent;
 import org.nl.wms.flow_manage.monitor.event.FlowStartEvent;
 import org.nl.wms.md_manage.vehicleMater.service.IMdPbVehicleMaterService;
 import org.nl.wms.md_manage.vehicleMater.service.dao.MdPbVehicleMater;
@@ -24,6 +27,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
+import java.math.BigDecimal;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -124,7 +128,6 @@ public class CheckStorageService {
                     .eq("id",mst.getId()));
         });
         BussEventMulticaster.Publish(startEvent);
-
     }
     private List<ExecutionDto> packageT(JSONObject current,String itemField){
         String id = current.getString(itemField);
@@ -146,4 +149,31 @@ public class CheckStorageService {
         }
         return null;
     }
+
+    public void  checkFinish(JSONObject form){
+        List<PmFormData> dtls = iFormDataService.getByParentId(form.getString("id"));
+
+        List<String> tmpCollect = dtls.stream().map(PmFormData::getVehicle_code).collect(Collectors.toList());
+        Map<String, String> vehicleMap = iMdPbVehicleMaterService.list(new QueryWrapper<MdPbVehicleMater>()
+                .select("vehicle_code", "proc_inst_id")
+                .in("vehicle_code", tmpCollect)
+                .last("group by vehicle_code")).stream().collect(HashMap::new, (formMap, o) -> {
+            formMap.put(o.getVehicle_code(), o.getProc_inst_id());
+        }, HashMap::putAll);
+        //更新载具物料关系
+        for (PmFormData dtl : dtls) {
+            iMdPbVehicleMaterService.update(new UpdateWrapper<MdPbVehicleMater>()
+                    .set("qty",dtl.getForm_data().getBigDecimal("change_qty"))
+                    .eq("vehicle_code",dtl.getVehicle_code()));
+        }
+        for (PmFormData dtl : dtls) {
+            FlowContinueEvent continueEvent = new FlowContinueEvent(vehicleMap.get(dtl.getVehicle_code()), null, null);
+            continueEvent.setCallback(emp->{
+                iFormDataService.update(new UpdateWrapper<PmFormData>()
+                        .set("status",StatusEnum.FORM_STATUS.code("执行中"))
+                        .eq("id",dtl.getId()));
+            });
+            BussEventMulticaster.Publish(continueEvent);
+        }
+    }
 }

wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/service/impl/StIvtStructattrServiceImpl.java

@@ -86,7 +86,7 @@ public class StIvtStructattrServiceImpl extends ServiceImpl<StIvtStructattrMappe
             record.setMaterial_id(vehicleMater.getMaterial_id());
             record.setPcsn(vehicleMater.getPcsn());
             record.setQty(vehicleMater.getQty());
-            record.setChange_qty(change_qty==null?vehicleMater.getQty():change_qty);
+            record.setChange_qty(change_qty==null?vehicleMater.getQty():change_qty.abs());
             record.setTask_type(task_type);
             record.setFrozen_qty(vehicleMater.getFrozen_qty());
             record.setSource_form_type(vehicleMater.getSource_form_type());

wms_pro/qd/src/views/wms/base_manage/sect/index.vue

@@ -79,9 +79,9 @@
                 >
                   <el-option
                     v-for="item in tableEnum.st_ivt_bsrealstorattr"
-                    :key="item.stor_code"
+                    :key="item.value"
-                    :label="item.stor_name"
+                    :label="item.label"
-                    :value="item.stor_code"
+                    :value="item.value"
                   />
                 </el-select>
               </el-form-item>
@@ -148,7 +148,12 @@
         <el-table-column prop="sect_code" sortable label="库区编码" />
         <el-table-column prop="sect_name" label="库区名称" width="150" />
         <el-table-column prop="simple_name" label="库区简称" width="150" />
-        <el-table-column prop="stor_name" label="仓库名称" width="150" />
+        <el-table-column prop="stor_code" label="仓库编码" width="150" />
+        <el-table-column prop="stor_code" label="仓库名称" width="150" >
+          <template slot-scope="scope">
+            {{ tableEnum.label.st_ivt_bsrealstorattr[scope.row.stor_code] }}
+          </template>
+        </el-table-column>
         <el-table-column prop="capacity" label="容量" />
         <el-table-column prop="sect_manager_name" label="负责人" />
         <el-table-column prop="mobile_no" label="联系电话" width="100px" />

wms_pro/qd/src/views/wms/base_manage/struct/index.vue

@@ -209,7 +209,11 @@
 -->
         <el-table-column prop="struct_code" label="仓位编码" :min-width="flexWidth('struct_code',crud.data,'仓位编码')" />
         <el-table-column prop="struct_name" label="仓位名称" :min-width="flexWidth('struct_name',crud.data,'仓位名称')" />
-        <el-table-column prop="sect_name" label="所属库区" width="150" />
+        <el-table-column prop="sect_code" label="所属库区" width="150" >
+          <template slot-scope="scope">
+            {{ tableEnum.label.st_ivt_sectattr[scope.row.sect_code] }}
+          </template>
+        </el-table-column>
         <el-table-column prop="stor_name" label="所属仓库" width="150" />
         <el-table-column prop="vehicle_code" label="载具号" :min-width="flexWidth('vehicle_code',crud.data,'载具号')" />
         <el-table-column prop="is_temp" label="是否临时" width="150" >
@@ -322,7 +326,7 @@ export default {
   name: 'Structattr',
   dicts: ['ST_HEIGHT_TYPE', 'is_used', 'd_lock_type', 'SCH_TASK_TYPE_DTL', 'placement_type'],
   statusEnums: ['LOCK'],
-  tableEnums: [ 'st_ivt_bsrealstorattr#stor_name#stor_code' ],
+  tableEnums: [ 'st_ivt_bsrealstorattr#stor_name#stor_code','st_ivt_sectattr#sect_name#sect_code' ],
   components: { pagination, crudOperation, rrOperation, udOperation },
   mixins: [presenter(), header(), form(defaultForm), crud()],
   cruds() {

wms_pro/qd/src/views/wms/flow_manage/act/execution/index.vue

@@ -83,7 +83,7 @@
         :data="crud.data"
         row-key="proc_inst_id"
         border
-        :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
+        :tree-props="{ children: 'children', hasChildren: 'has' }"
         size="small"
         style="width: 100%;"
       >
@@ -296,15 +296,15 @@ export default {
       })
     },
     flowConfirm(proc_inst_id) {
-      curdExecution.flowConfirm(proc_inst_id).then(res => {
+       curdExecution.flowConfirm(proc_inst_id).then(res => {
         crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
       })
       this.crud.toQuery()
     },
-    load(tree, treeNode, resolve) {
+   async load(tree, treeNode, resolve) {
-      setTimeout(() => {
+      curdExecution.queryByParentId(tree.proc_inst_id).then(res => {
-        resolve(tree.children)
+        resolve(res)
-      }, 100)
+      })
     },
     changeActive(row) {
       curdExecution.changeActive(row)

wms_pro/qd/src/views/wms/stor_manage/record/index.vue

@@ -98,11 +98,16 @@
         <el-table-column prop="pcsn" label="批次" min-width="150" show-tooltip-when-overflow/>
         <el-table-column prop="qty" label="总库存" min-width="150" show-tooltip-when-overflow/>
         <el-table-column prop="frozen_qty" label="冻结库存" show-tooltip-when-overflow/>
+        <el-table-column prop="change_qty" label="变动库存" show-tooltip-when-overflow/>
         <el-table-column prop="unit_name" label="单位" show-tooltip-when-overflow/>
         <el-table-column prop="vehicle_form_data" label="物料扩展信息" width="300" show-tooltip-when-overflow/>
         <el-table-column prop="source_form_type" label="单据编号" show-tooltip-when-overflow/>
         <el-table-column prop="source_form_id" label="单据表名" min-width="120" show-tooltip-when-overflow/>
-        <el-table-column prop="task_type" label="变动类型" min-width="150" show-tooltip-when-overflow/>
+        <el-table-column prop="task_type" show-overflow-tooltip show-tooltip-when-overflow label="变动类型">
+          <template slot-scope="scope">
+            {{ statusEnum.label.TASK_TYPE[scope.row.task_type] }}
+          </template>
+        </el-table-column>
         <el-table-column prop="update_time" label="修改时间" width="120" show-tooltip-when-overflow/>
 
         <!--        <el-table-column-->
@@ -151,6 +156,7 @@ export default {
   dicts: [],
   name: 'StructIvtFlow',
   components: {pagination, crudOperation, rrOperation, udOperation},
+  statusEnums: ['TASK_TYPE'],
   mixins: [presenter(), header(), form(defaultForm), crud()],
   cruds() {
     return CRUD({

wms_pro/qd/src/views/wms/stor_manage/storIvtInfo/StructAttrDialog.vue

@@ -62,7 +62,11 @@
           <el-radio v-model="tableRadio" :label="scope.row"><i /></el-radio>
         </template>
       </el-table-column>
-      <el-table-column prop="sect_name" label="库区"  show-overflow-tooltip />
+      <el-table-column prop="sect_code" label="库区"  show-overflow-tooltip >
+        <template slot-scope="scope">
+          {{ tableEnum.label.st_ivt_sectattr[scope.row.sect_code] }}
+        </template>
+      </el-table-column>
       <el-table-column prop="stor_name" label="仓库"  show-overflow-tooltip />
       <el-table-column prop="struct_code" label="仓位编码"  show-overflow-tooltip />
       <el-table-column prop="struct_name" label="仓位名称" show-overflow-tooltip />
@@ -126,7 +130,7 @@ export default {
       }})
   },
   mixins: [presenter(), header()],
-  tableEnums: [ 'bm_measure_unit#unit_name#unit_id' ],
+  tableEnums: [ 'bm_measure_unit#unit_name#unit_id','st_ivt_sectattr#sect_name#sect_code' ],
   statusEnums: [ 'LOCK' ],
   props: {
     dialogShow: {

wms_pro/qd/src/views/wms/stor_manage/warehouse/checkStorage/AddDialog.vue

@@ -286,6 +286,7 @@ export default {
         data.unit_id = row.unit_id
         data.form_type = 'st_ivt_checkdtl'
         data.form_data = {}
+        data.end_struct_code = row.struct_code
         this.dtlCols.forEach(a=>{
           let item = ''
           if (a.value in data) {

wms_pro/qd/src/views/wms/stor_manage/warehouse/checkStorage/TaskDialog.vue

@@ -115,7 +115,7 @@
         <el-table-column width="160" show-overflow-tooltip v-for="(item, index) in dtlCols" :key="item.value"
                          :label="item.lable">
           <template slot-scope="scope">
-            <el-input-number v-if="item.value == 'check_qty'" v-model="scope.row.form_data[item.value]" @input="qtyClick(scope.row)" class="input-with-select" />
+            <el-input-number v-if="item.value == 'change_qty'" v-model="scope.row.form_data[item.value]" @input="qtyClick(scope.row)" class="input-with-select" />
             <el-select disabled v-if="item.value == 'profit_loss'"
                        v-model="scope.row.form_data[item.value]"
                        clearable
@@ -131,7 +131,7 @@
                 :value="item.value"
               />
             </el-select>
-            <el-input v-if="item.value != 'check_qty' && item.value != 'profit_loss'" v-model="scope.row.form_data[item.value]" disabled class="input-with-select" />
+            <el-input v-if="item.value != 'change_qty' && item.value != 'profit_loss'" v-model="scope.row.form_data[item.value]" disabled class="input-with-select" />
           </template>
         </el-table-column>
 
@@ -307,13 +307,13 @@ export default {
       this.$refs['form2'].resetFields()
     },
     qtyClick(row){
-      if (row.form_data.check_qty > row.qty){
+      if (row.form_data.change_qty > row.qty){
         this.$set(row.form_data, 'profit_loss', '1')
       }
-      if (row.form_data.check_qty < row.qty){
+      if (row.form_data.change_qty < row.qty){
         this.$set(row.form_data, 'profit_loss', '0')
       }
-      if (row.form_data.check_qty == row.qty){
+      if (row.form_data.change_qty == row.qty){
         this.$set(row.form_data, 'profit_loss', '2')
       }
     }

wms_pro/qd/src/views/wms/stor_manage/warehouse/checkStorage/index.vue

@@ -268,7 +268,7 @@ export default {
         if (row.status == '13'){
           this.finish_flag = false
         }else {
-          this.finish_flag = false
+          this.finish_flag = true
         }
         this.dis_flag = false
         this.currentRow = row
@@ -293,6 +293,14 @@ export default {
         })
       }
     },
+    checkFinish(row) {
+      if (this.currentRow !== null) {
+        crudCheck.checkFinish(this.currentRow).then(res => {
+          this.crud.notify('盘点确认', CRUD.NOTIFICATION_TYPE.SUCCESS)
+          this.crud.toQuery()
+        })
+      }
+    },
     toDelete(id) {
       if (id !== null) {
         crudCheck.del([id]).then(res => {

wms_pro/qd/src/views/wms/stor_manage/warehouse/profitAndLoss/formData.js

@@ -0,0 +1,49 @@
+import request from '@/utils/request'
+
+export function add(data) {
+  return request({
+    url: 'api/pmFormData',
+    method: 'post',
+    data
+  })
+}
+
+export function del(ids) {
+  return request({
+    url: 'api/pmFormData',
+    method: 'delete',
+    data: ids
+  })
+}
+
+export function edit(data) {
+  return request({
+    url: 'api/pmFormData',
+    method: 'put',
+    data
+  })
+}
+
+export function getFormType() {
+  return request({
+    url: 'api/bmFormStruc/getTypes',
+    method: 'get',
+  })
+}
+
+export function getParentFormTypes() {
+  return request({
+    url: 'api/bmFormStruc/getParentFormTypes',
+    method: 'get',
+  })
+}
+
+export function getSonFormData(id) {
+  return request({
+    url: 'api/pmFormData/getSonFormData/' + id,
+    method: 'get',
+  })
+}
+
+
+export default {add, edit, del, getFormType, getParentFormTypes, getSonFormData}

wms_pro/qd/src/views/wms/stor_manage/warehouse/profitAndLoss/index.vue

@@ -0,0 +1,267 @@
+<template>
+  <div class="app-container">
+    <!--工具栏-->
+    <div class="head-container">
+      <div v-if="crud.props.searchToggle">
+        <!-- 搜索 -->
+        <el-form
+          :inline="true"
+          class="demo-form-inline"
+          label-position="right"
+          label-width="90px"
+          label-suffix=":"
+        >
+          <el-form-item label="单据类型">
+            <el-select
+              v-model="query.form_type"
+              filterable
+              size="mini"
+              placeholder="请选择/搜索"
+              class="filter-item"
+              @change="crud.toQuery()"
+            >
+              <el-option
+                v-for="item in fromTypes"
+                :key="item.value"
+                :value="item.value"
+                :label="item.label"
+              />
+            </el-select>
+          </el-form-item>
+          <template v-for="(col,index) in cols" v-if="hideShowDialog">
+            <el-form-item label="col.lable">
+              <label slot="label">{{ col.lable }}:</label>
+              <el-input v-model="query.form_query[col.value]" :value="col.value" clearable style="width: 210px" />
+            </el-form-item>
+          </template>
+          <rrOperation :crud="crud" />
+        </el-form>
+      </div>
+      <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
+      <crudOperation :permission="permission">
+        <el-button
+          slot="right"
+          class="filter-item"
+          type="success"
+          icon="el-icon-position"
+          size="mini"
+          :disabled="task_flag"
+          @click="taskOpen"
+        >
+          作业下发
+        </el-button>
+      </crudOperation>
+
+      <!--表格渲染-->
+      <el-table
+        ref="table"
+        v-loading="crud.loading"
+        @select="handleSelectionChange"
+        :data="crud.data"
+      >
+        <el-table-column type="selection" width="55" />
+        <el-table-column prop="code" label="单据编码" show-overflow-tooltip width="120">
+          <template slot-scope="scope">
+            <el-link v-if="scope.row.hasChildren" type="warning" @click="toView(scope.row)">{{
+              scope.row.code
+            }}
+            </el-link>
+            <span v-else>{{ scope.row.code }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="form_type" label="单据类型" show-overflow-tooltip width="120" />
+        <el-table-column prop="status" label="单据状态" show-overflow-tooltip width="120">
+          <template slot-scope="scope">
+            <template v-for="item in statusEnum.FORM_STATUS">
+              <span v-if="item.value === scope.row.status">{{ item.label }}</span>
+            </template>
+          </template>
+        </el-table-column>
+        <el-table-column
+          v-for="(item, index) in cols"
+          :key="item.value"
+          width="130"
+          show-overflow-tooltip
+          :label="item.lable"
+        >
+          <template slot-scope="scope">{{ scope.row.form_data[item.value] }}</template>
+        </el-table-column>
+        <el-table-column prop="remark" label="备注" />
+        <el-table-column prop="create_time" label="创建时间" />
+        <el-table-column prop="create_name" label="创建人" />
+        <el-table-column prop="update_time" label="修改时间" />
+        <el-table-column prop="create_name" label="修改人" />
+        <el-table-column prop="proc_inst_id" label="对应流程实例id" show-overflow-tooltip width="120" />
+        <el-table-column
+          label="操作"
+          fixed="right"
+          align="center"
+          width="180"
+        >
+          <template slot-scope="scope">
+            <el-button size="mini" type="text" icon="el-icon-edit" @click="crud.toEdit(scope.row)">修改</el-button>
+            <el-button size="mini" type="text" icon="el-icon-delete" @click="toDelete(scope.row.id)">删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <!--分页组件-->
+      <pagination />
+    </div>
+
+  </div>
+</template>
+
+<script>
+import crudFormData from './formData'
+import CRUD, { crud, form, header, presenter } from '@crud/crud'
+import crudOperation from '@crud/CRUD.operation'
+import udOperation from '@crud/UD.operation'
+import rrOperation from '@crud/RR.operation'
+import pagination from '@crud/Pagination'
+import formstruc from '@/views/wms/config_manage/formStruc/formstruc'
+import crudmove from './pl'
+
+
+// import UploadDialog from './UploadDialog'
+
+const defaultForm = {
+  id: null,
+  code: null,
+  proc_inst_id: null,
+  biz_id: null,
+  boz_code: null,
+  biz_date: null,
+  form_type: null,
+  status: null,
+  create_time: null,
+  create_name: null,
+  material_id: null,
+  qty: null,
+  pcsn: null,
+  vehicle_code: null,
+  from_data: null,
+  parent_id: null
+}
+export default {
+  name: 'st_ivt_profitloss',
+  statusEnums: ['FORM_STATUS'],
+  components: { pagination, crudOperation, rrOperation, udOperation},
+  mixins: [presenter(), header(), form(defaultForm), crud()],
+  cruds() {
+    return CRUD({
+      title: '移库单',
+      url: 'api/pmFormData',
+      idField: 'id',
+      sort: 'id,desc',
+      crudMethod: { ...crudFormData },
+      optShow: {
+        add: true,
+        reset: true
+      },
+      query: {
+        form_type:'st_ivt_profitloss',
+        form_data: {}
+      }
+    })
+  },
+  data() {
+    return {
+      cols: [],
+      classes: [],
+      task_flag: true,
+      currentRow: null,
+      uploadShow: false,
+      dis_flag: true,
+      fromTypes: [],
+      permission: {},
+      rules: {},
+      hideShowDialog: false
+    }
+  },
+  mounted() {
+  },
+  created() {
+    // 获取分类
+    formstruc.getHeader('st_ivt_profitloss').then(res => {
+      this.cols = res
+      res.forEach(a => {
+        this.form.form_data[a.value, '']
+      })
+    })
+  },
+  methods: {
+    ToExpandall() {
+      const els = document.getElementsByClassName('el-table__expand-icon')
+      if (this.crud.data.length !== 0 && els.length !== 0) {
+        for (let j1 = 0; j1 < els.length; j1++) {
+          els[j1].classList.add('dafult')
+        }
+        if (this.$el.getElementsByClassName('el-table__expand-icon--expanded')) {
+          const open = this.$el.getElementsByClassName('el-table__expand-icon--expanded')
+          for (let j = 0; j < open.length; j++) {
+            open[j].classList.remove('dafult')
+          }
+          const dafult = this.$el.getElementsByClassName('dafult')
+          for (let a = 0; a < dafult.length; a++) {
+
+            dafult[a].click()
+          }
+        }
+      }
+    },
+    hideShow() {
+      if (this.hideShowDialog) {
+        // this.$set(this.query, 'form_query', {})
+      }
+      this.hideShowDialog = !this.hideShowDialog
+    },
+    toView(row) {
+      if (row !== null) {
+        this.$refs.viewDialog.setForm(row)
+      }
+    },
+
+    handleSelectionChange(val, row) {
+      if (val.length === 1) {
+        if (row.status == '10'){
+          this.task_flag = false
+        }else {
+          this.task_flag = true
+        }
+        this.dis_flag = false
+        this.currentRow = row
+      } else {
+        this.task_flag = true
+        this.dis_flag = true
+        this.currentRow = null
+      }
+    },
+
+    disOpen(row) {
+      if (this.currentRow !== null) {
+        this.$refs.taskDis.setForm(this.currentRow)
+      }
+    },
+    taskOpen(row) {
+      if (this.currentRow !== null) {
+        crudmove.taskopen(this.currentRow).then(res => {
+          this.crud.notify('下发成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
+          this.crud.toQuery()
+        })
+      }
+    },
+    toDelete(id) {
+      if (id !== null) {
+        crudmove.del([id]).then(res => {
+          this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
+          this.crud.toQuery()
+        })
+      }
+    },
+
+  }
+}
+</script>
+
+<style scoped>
+</style>

wms_pro/qd/src/views/wms/stor_manage/warehouse/profitAndLoss/pl.js

@@ -0,0 +1,42 @@
+import request from '@/utils/request'
+
+export function add(data) {
+  return request({
+    url: '/api/move/save',
+    method: 'post',
+    data
+  })
+}
+
+export function del(ids) {
+  return request({
+    url: 'api/move',
+    method: 'delete',
+    data: ids
+  })
+}
+
+export function edit(data) {
+  return request({
+    url: 'api/move',
+    method: 'post',
+    data
+  })
+}
+export function updateStatus(data) {
+  return request({
+    url: '/api/move/updateStatus',
+    method: 'post',
+    data
+  })
+}
+
+export function taskopen(data) {
+  return request({
+    url: '/api/move/taskOpen',
+    method: 'post',
+    data
+  })
+}
+
+export default {add, edit, del, updateStatus, taskopen}