Merge remote-tracking branch 'origin/master'

luqingyang

2023-10-30 1b41d774274c784adce2df6ed19fdffe0c22a113

Merge remote-tracking branch 'origin/master'

 admin-web/src/api/baseSetting/finsystenant.js

@@ -7,7 +7,7 @@
 * @Date 2023/7/13 20:11
 */
export function getTree(parameter) {
  return request.get(SettingIplatform.apiBaseURL + '/pc/fin/sys/tenant/select/tree_fin_tenant', {params: parameter})
  return request.get(SettingIplatform.apiBaseURL + '/pc/base/category/select/tree', {params: parameter})
}

/**
@@ -84,6 +84,14 @@
  })
}

export function upcode(data) {
  return request({
    url: '/pc/base/goods/template/updStatus',
    method: 'post',
    data: data
  })
}

export function delCode(data) {
  return request({
    url: '/pc/base/goods/template/del',
@@ -92,6 +100,20 @@
  })
}

export function treeList() {
  return request({
    url: '/pc/base/category/select/lv3_tree',
    method: 'get',
  })
}

export function classList() {
  return request({
    url: '/pc/base/goods/template/select/classificationCode',
    method: 'get',
  })
}

// æŸ¥è¯¢éƒ¨é—¨
export function getOegs(parameter) {
  return request.get(SettingIplatform.apiBaseURL + '/pc/fin/sys/org/select/down/list', {params: parameter})

 admin-web/src/views/foundation/classification/index.vue

@@ -189,12 +189,14 @@
    // å·¦ä¾§æ ‘初始化
    initTreeData() {
      finsystenant.getTree().then(res => {
        console.log(res, 'restree');
        console.log(this.importSetting,'this.importSetting');
        const content = res || []
        this.treeDataList.splice(0, this.treeDataList.length)
        // this.treeDataList.splice(0, this.treeDataList.length)
        this.treeDataList = content
        if (content.length > 0) {
          this.importSetting.fileSettings.data = {pid: content[0].id}
        }
        // if (content.length > 0) {
        //   this.importSetting.fileSettings.data = {pid: content[0].id}
        // }
      })
    },
    updState(row) {
@@ -243,6 +245,7 @@
      this.editSetting.show = true;
    },
    nodeClick(param) {
      console.log(param, 'param');
      param = param || {}
      this.p = Object.assign({}, {
        id: param.id,

 admin-web/src/views/foundation/classification/items.js

@@ -11,7 +11,7 @@
    dataIndex: 'classification',
    label: '类别',
    placeholder: '请选择',
    defaultValue: '1',
    defaultValue: '',
    options: [
      {
        label: 'A',

 admin-web/src/views/foundation/material/edit.vue

@@ -8,7 +8,9 @@
        <el-input v-model="formData.goodsName" clearable maxlength="20" show-word-limit style="width: 100%"/>
      </el-form-item>
      <el-form-item label="分类" prop="categoryId">
        <el-input v-model="formData.categoryId" clearable maxlength="20" show-word-limit style="width: 100%"/>
        <el-select v-model="formData.categoryId" clearable placeholder="请选择"  style="width: 100%">
          <el-option v-for="item in categoryList" :key="item.id" :label="item.categoryName" :value="item.id"></el-option>
        </el-select>
      </el-form-item>
      <el-form-item style="margin-left: -100px;" v-for="(m, i) in formData.models">
        <el-form-item label="规格型号" prop="modelName" style="float: left;">
@@ -50,6 +52,7 @@
  },
  data() {
    return {
      categoryList:[],
      checkAll: false,
      checkedList: [],
      formData: {
@@ -74,11 +77,20 @@
    }
  },
  created() {
    this.tree_List()
    if(this.setting.info){
      this.formData = Object.assign({},JSON.parse(this.setting.info))
    }
  },
  methods: {
    tree_List (){
      finsystenant.treeList().then(res => {
        if (res) {
          console.log(res,'res');
          this.categoryList = res
        }
      })
    },
    addCode(){
      this.formData.models.push(
        {

 admin-web/src/views/foundation/material/index.vue

@@ -258,13 +258,13 @@
    },
    updState(row) {
      let vm = this
      let text = row.status == 0 ? "启用" : "禁用";
      let text = row.states == 0 ? "启用" : "禁用";
      vm.$modal.confirm('确认要' + text + '"' + row.goodsName + '"吗？').then(function () {
        let params = Object.assign({}, row)
        params.status = row.status == 1 ? 0 : 1
        finsystenant.editcode(params).then(res => {
        params.states = row.states == 1 ? 0 : 1
        finsystenant.upcode(params).then(res => {
          if (res) {
            row.status = row.status === 1 ? 0 : 1
            row.states = row.states === 1 ? 0 : 1
            vm.$modal.msgSuccess(text + "成功");
            vm.search()
          }

 admin-web/src/views/foundation/store/edit.vue

@@ -7,8 +7,10 @@
      <el-form-item label="仓库名称" prop="warehouseName">
        <el-input v-model="formData.warehouseName" clearable maxlength="20" show-word-limit style="width: 100%"/>
      </el-form-item>
      <el-form-item label="仓库类型" prop="classificationId">
        <el-input v-model="formData.classificationId" clearable maxlength="20" show-word-limit style="width: 100%"/>
      <el-form-item label="仓库类型" prop="classificationCode">
        <el-select v-model="formData.classificationCode" clearable placeholder="请选择"  style="width: 100%">
          <el-option v-for="item in classList" :key="item.dict_code" :label="item.dict_label" :value="item.dict_code"></el-option>
        </el-select>
      </el-form-item>
      <el-form-item label="地址" >
        <el-input v-model="formData.adress" clearable maxlength="20" show-word-limit style="width: 100%"/>
@@ -43,6 +45,7 @@
  },
  data() {
    return {
      classList:[],
      checkAll: false,
      checkedList: [],
      formData: {
@@ -62,11 +65,20 @@
    }
  },
  created() {
    this.class_List()
    if(this.setting.info){
      this.formData = Object.assign({},JSON.parse(this.setting.info))
    }
  },
  methods: {
    class_List (){
      finsystenant.classList().then(res => {
        if (res) {
          console.log(res,'res');
          this.classList = res
        }
      })
    },
    getEditInfo(id){

    },

 consum-base/doc/ÏîÄ¿×ÊÁÏ/ºÓÄÏÓÊÕþµÍÖµÒ׺ÄÆ·V20231023.pdm

Diff too large

 consum-base/src/main/java/com/consum/base/service/LWhFormOutputCoreService.java

@@ -149,7 +149,7 @@
     * æ ¹æ® å‡ºåº“单 å‡ºåº“
     *
     * @param outWarehouseFormId å‡ºåº“单Id
     * @return
     * @return æµæ°´è®°å½•æ€»è¡¨ID
     */
    @Transactional(rollbackFor = Exception.class)
    public Long outFormByTransId(Long outWarehouseFormId, S_user_core currentUser, Long dealTime) {

 consum-base/src/main/java/com/consum/base/service/LWhFormTransferCoreService.java

@@ -19,23 +19,13 @@
@Slf4j
public class LWhFormTransferCoreService {
    @Resource
    private LWhProcureModelService lWhProcureModelService;
    @Resource
    private LWhFormTransferService lWhFormTransferService;
    @Resource
    private LWarehouseFlowCoreService lWarehouseFlowService;
    @Resource
    private LWhFormOutputCoreService lWhFormOutputCoreService;


    /**
     * æ‰§è¡Œè°ƒæ‹¨å‡ºåº“操作
     * 1. é€šè¿‡è°ƒæ‹¨å•ã€WH_FORM_TRANSFER】 ç¡®å®šè°ƒæ‹¨å•ç‰©å“ã€L_WH_PROCURE_MODEL】
     * 2. æ ¡éªŒåº“å­˜
     * 3. æ›´æ–°è¿›å‡ºåº“流水总表[L_WAREHOUSE_FLOW]、各规格物品的进出库【L_WH_GOODS_RECORD】、进出库流水明细[L_WH_GOODS_RECORD_DETAILS]、
     * åº“存物品详情（L_WH_GOODS）
     * 4. æ›´æ–°è°ƒæ‹¨å•ã€WH_FORM_TRANSFER】为待接收，更新调拨单物品【WH_FORM_TRANSFER_MODEL】出库流水ID
     *
     * @param whFormTransferId è°ƒæ‹¨å•id
     */
    public void doTransferOutPut(Long whFormTransferId, S_user_core currentUser) {
@@ -75,4 +65,39 @@
        return;

    }

    /**
     * è°ƒæ‹¨å•å…¥åº“
     *
     * @param whFormTransferId
     * @param currentUser
     */
    public void doTransferInPut(Long whFormTransferId, S_user_core currentUser) {
        LWhFormTransfer lWhFormTransfer = new LWhFormTransfer(whFormTransferId);
        lWhFormTransfer = lWhFormTransferService.get(lWhFormTransfer);
        if (lWhFormTransfer == null || lWhFormTransfer.getStates() != 1) {
            log.error("调拨失败！请检查调拨单状态");
            return;
        }
        Long userId = currentUser.getId();
        String nickName = currentUser.getNick_name();

        // å‡ºåº“单ID
        Long outWarehouseFormId = lWhFormTransfer.getOutWarehouseFormId();
        long dealTime = DateUtils.getDateTimeNumber(System.currentTimeMillis());
        // æµæ°´è®°å½•æ€»è¡¨ID
        long lWarehouseFlowId = lWhFormOutputCoreService.outFormByTransId(outWarehouseFormId, currentUser, dealTime);

        // æ›´æ–°è°ƒæ‹¨å•
        lWhFormTransfer = new LWhFormTransfer(whFormTransferId);
        lWhFormTransfer.setInWarehouseFormId(lWarehouseFlowId);
        lWhFormTransfer.setStates(2);
        lWhFormTransfer.setInOperatorId(userId);
        lWhFormTransfer.setInOperatorName(nickName);
        lWhFormTransfer.setInTime(dealTime);
        lWhFormTransferService.update(lWhFormTransfer);

        log.info("调拨单：{} å…¥åº“完成", whFormTransferId);
        return;
    }
}