Merge remote-tracking branch 'origin/mdqdasrsVersion' into mdqdasrsVersion

LSH

2023-12-28 e27a4186c67c7087435c414a4338d2df48c81d63

Merge remote-tracking branch 'origin/mdqdasrsVersion' into mdqdasrsVersion

 src/main/java/com/zy/common/web/WcsController.java

@@ -190,7 +190,8 @@
        // 源站点状态检测
        BasDevp sourceStaNo = basDevpService.checkSiteStatus(devpNo, true);
        // 检索库位
        List<String> matNos = waitPakins.stream().map(WaitPakin::getMatnr).distinct().collect(Collectors.toList());
        List<String> matnrs = waitPakins.stream().map(WaitPakin::getMatnr).distinct().collect(Collectors.toList());
        List<String> batchs = waitPakins.stream().map(WaitPakin::getBatch).distinct().collect(Collectors.toList());
        int rowCount = rowLastnoService.selectCount(null);
        Integer integer = 2;
        for (int i = 1; i <= rowCount; i++) {
@@ -202,7 +203,7 @@
            }
        }

        StartupDto dto = commonService.getLocNo(1, 1, devpNo, null,null,null,0, locTypeDto,0);
        StartupDto dto = commonService.getLocNo(1, 1, devpNo, matnrs.get(0),batchs.get(0),null,0, locTypeDto,0);
        int workNo = dto.getWorkNo();
        Date now = new Date();
        // 生成工作档

 src/main/resources/mapper/LocDetlMapper.xml

@@ -434,7 +434,7 @@
        where 1=1
        and b.loc_sts = 'F'
        and a.matnr = #{matnr}
        and a.payment = 1

        <!--        <choose>-->
        <!--            <when test="batch != null and batch != ''">-->
        <!--                and a.batch = #{batch}-->
@@ -454,7 +454,7 @@
        </choose>

        order by
        a.price asc,a.manu,DATEPART(yyyy,a.modi_time),DATEPART(mm,a.modi_time),DATEPART(dd,a.modi_time), a.anfme
        a.manu,DATEPART(yyyy,a.modi_time),DATEPART(mm,a.modi_time),DATEPART(dd,a.modi_time), a.anfme
        desc,
        NEWID(),
        case
@@ -645,7 +645,7 @@
        where 1=1
        and b.loc_sts = 'F'
        and a.matnr = #{matnr}
        and a.payment = 1

        <!--        <choose>-->
        <!--            <when test="batch != null and batch != ''">-->
        <!--                and a.batch = #{batch}-->
@@ -665,7 +665,7 @@
        </choose>

        order by
        a.price desc,a.manu,DATEPART(yyyy,a.modi_time),DATEPART(mm,a.modi_time),DATEPART(dd,a.modi_time), a.anfme
        a.manu,DATEPART(yyyy,a.modi_time),DATEPART(mm,a.modi_time),DATEPART(dd,a.modi_time), a.anfme
        desc,
        NEWID(),
        case

 src/main/webapp/static/image/logo.jpg

 src/main/webapp/static/image/logo.png

 src/main/webapp/views/login.html

@@ -68,7 +68,7 @@
      <div class="login-contain">
        <div class="login-box">
          <img src="../static/image/logo.png" alt="" style="width: 80%">
          <span class="login100-form-title p-t-20 p-b-45">米多智能</span>
<!--          <span class="login100-form-title p-t-20 p-b-45">米多智能</span>-->
          <span class="login100-form-title p-t-20 p-b-45" style="margin: 15px 0;color: #868686;font-size: 24px">WMS</span>
          <div class="wrap-input100 validate-input m-b-10" data-validate="请输入用户名">
            <input id="username" class="input100" type="text" name="username" placeholder="username" autocomplete="off">