`1`

pjb

2025-09-09 34e429f219812e65204571f20bc7f90370e01858

`1`

 construction-data/src/components/datav/index.vue

@@ -83,7 +83,7 @@
<!--                    </el-col>-->
<!--                  </el-row>-->
                  <div class="pick-wall-box">
                    <el-col :span="6" v-for="(item, index) in seedBracket" :key="index" @click.native="lightClick(item)">
                    <el-col :span="6" v-for="(item, index) in seedBracket" :key="index" >
                      <div class="seed-bracket" :style="getLightStatus(item)" />
                    </el-col>
                  </div>
@@ -117,7 +117,7 @@
                    <el-col>
                      <div class="header-title">拣货数量：</div>
                      <dv-border-box-10  class="box">
                        <el-input type="text" v-model="getWorkQty" disabled></el-input>
                        <el-input type="text" v-model="selected.revQty" disabled></el-input>
                      </dv-border-box-10>
                    </el-col>
                  </el-row>
@@ -341,7 +341,7 @@
      //隐藏弹框
      this.show = false
      // eslint-disable-next-line no-undef
      $ajax.post('wave/sow/review', { waveSeedId: this.selected.id, reviewNum: this.getWorkQty }).then(response => {
      $ajax.post('wave/sow/review', { waveSeedId: this.selected.id, reviewNum: this.selected.revQty }).then(response => {
        if (response.code === 200) {
          this.getWaves()
        } else {

 zy-asrs-admin/src/views/IndexView.vue

@@ -204,18 +204,33 @@
const licenseDays = ref(365);

getLicenseDays();

function getLicenseDays() {

 const currentDate = new Date();

 const newDate = new Date(currentDate);

  post('/api/license/getLicenseDays', {}).then((resp) => {

    let result = resp.data;

    let data = result.data;

    if (result.code == 200) {

      licenseDays.value = data;

      if(data <= 15) {

      　alert("许可证有效期：" + data + "天")

       newDate.setDate(currentDate.getDate() + data);

      　alert("许可证有效期：" + data + "天，"　+　"到期日期："　+　formatDate(newDate))

      }

    }

  })

}



// 完整的日期格式化函数

function formatDate(date, format = 'yyyy-MM-dd') {

    const year = date.getFullYear();

    const month = String(date.getMonth() + 1).padStart(2, '0');

    const day = String(date.getDate()).padStart(2, '0');



    return format

        .replace('yyyy', year)

        .replace('MM', month)

        .replace('dd', day);

}



const switchHost = (item) => {

  globalState.currentHost = item;

  postForm('/api/root/change/host/auth', {


 zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/entity/domain/WaveTaskDetl.java

@@ -25,6 +25,9 @@
     * 数量
     */
    private Integer anfme;

    @TableField(exist = false)
    private Integer revQty;
    /**
     * 波次号
     */

 zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/MobileServiceImpl.java

@@ -444,12 +444,12 @@
                throw new CoolException("订单播种位绑定失败！！");

            }



//            if (!waveSeedMapper.update(new LambdaUpdateWrapper<WaveSeed>()

//                    .eq(WaveSeed::getOrderNo, order.getOrderNo())

//                    .set(WaveSeed::getSiteId, siteNo.getId())

//                    .set(WaveSeed::getSiteNo, siteNo.getSiteNo()))) {

//                throw new CoolException("播种站点更新失败！！");

//            }

            if (!waveSeedMapper.update(new LambdaUpdateWrapper<WaveSeed>()

                    .eq(WaveSeed::getOrderNo, order.getOrderNo())

                    .set(WaveSeed::getSiteId, siteNo.getId())

                    .set(WaveSeed::getSiteNo, siteNo.getSiteNo()))) {

                throw new CoolException("播种站点更新失败！！");

            }

            //绑定成功，播种墙亮灯

            sowLightMange(siteNo.getSiteNo(), order, "LIGHT");

        } else {