Merge remote-tracking branch 'origin/skwcs' into tzskwcs

Junjie

2023-10-03 81d91a7995cb59f495af0b9677173fb2f59b3532

Merge remote-tracking branch 'origin/skwcs' into tzskwcs

 src/main/java/com/zy/asrs/mapper/WrkMastMapper.java

@@ -74,4 +74,6 @@
    List<WrkMast> selectShuttleMoveWrk();

    WrkMast selectShuttleWorking(@Param("shuttleNo") Integer shuttleNo);//是否有穿梭车任务(移库任务除外)

    WrkMast selectByBarcode(String barcode);
}

 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java

@@ -3,6 +3,7 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.core.common.Cools;
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
@@ -1916,6 +1917,13 @@
                        }
                    }

                    if (!Cools.isEmpty(barcode)) {
                        WrkMast wrkMast = wrkMastMapper.selectByBarcode(barcode);//条码存在工作档
                        if (wrkMast != null) {
                            continue;
                        }
                    }

                    LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, emptyInSta.getLed());

                    try {

 src/main/resources/application.yml

@@ -8,10 +8,10 @@
    name: @pom.build.finalName@
  datasource:
    driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
    url: jdbc:sqlserver://127.0.0.1:1433;databasename=tzskasrs
    url: jdbc:sqlserver://10.10.10.40:1433;databasename=tzskasrs
    username: sa
#    password: Zoneyung@zy56$
    password: sa
    password: sa@123
  mvc:
    static-path-pattern: /**
  redis:

 src/main/resources/mapper/WrkMastMapper.xml

@@ -217,4 +217,11 @@
        and io_type not in (200)
        order by io_pri desc,io_time,wrk_no asc
    </select>

    <select id="selectByBarcode" resultMap="BaseResultMap">
        select top 1 * from dbo.asr_wrk_mast
        where 1=1
        and barcode = #{barcode}
        order by io_pri desc,io_time,wrk_no asc
    </select>
</mapper>