#

Junjie

2025-06-24 8bc42661b6cad3fb00e21ba8a4de17d9b3f90527

#

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

@@ -58,6 +58,9 @@

    WrkMast selectWorking(@Param("crnNo")Integer crnNo);

    @Update("update asr_wrk_mast set wrk_sts=#{wrkSts} where wrk_no = #{wrkNo}")
    int updateWrkSts(Long wrkSts, Integer wrkNo);

    // work log -------------------------------------------------------
    @Insert("insert into asr_wrk_mast_log select * from asr_wrk_mast where wrk_no=#{workNo}")
    int saveWrkMastLog(Integer workNo);

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

@@ -13,7 +13,6 @@
import com.zy.asrs.mapper.WrkMastMapper;
import com.zy.asrs.service.*;
import com.zy.asrs.utils.Utils;
import com.zy.asrs.utils.VersionUtils;
import com.zy.common.constant.RedisConstantType;
import com.zy.common.model.LocTypeDto;
import com.zy.common.model.MatDto;
@@ -2286,15 +2285,16 @@
                Integer devpId = null;
                Integer devpStaNo = null;
                String locNo = null;
                Long updateWrkSts = null;
                if (wrkMast.getIoType() < 100) {
                    //入库
                    wrkMast.setWrkSts(2L);
                    updateWrkSts = 2L;
                    devpId = 1;
                    devpStaNo = 2003;
                    locNo = wrkMast.getLocNo();
                }else {
                    //出库
                    wrkMast.setWrkSts(15L);
                    updateWrkSts = 15L;
                    devpId = 2;
                    devpStaNo = 2002;
                    locNo = wrkMast.getSourceLocNo();
@@ -2323,11 +2323,7 @@
                    if (!result) {
                        throw new CoolException("更新plc站点信息失败");
                    }

                    Date now = new Date();
                    wrkMast.setModiTime(now);
                    wrkMastService.updateById(wrkMast);

                    wrkMastMapper.updateWrkSts(updateWrkSts, wrkMast.getWrkNo());
                    rgvThread.setResetFlag1(true);
                }
            }