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

zjj

2024-11-13 340b69790a7a2eff1ff5de75f109dc77f4b4008f

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

 src/main/java/com/zy/asrs/entity/LocDetl.java

@@ -289,6 +289,13 @@
        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
    }

    public void setOwner(Integer owner) {
        if (Cools.isEmpty(owner) || owner == 0){
            this.owner = 32;
        }
        this.owner = owner;
    }

    public void sync(Object source) {
        Synchro.Copy(source, this);
    }

 src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java

@@ -188,12 +188,14 @@
                        manPakOutEntityWrapper.eq("doc_num",wrkDetl.getOrderNo());
                        manPakOutEntityWrapper.eq("matnr",wrkDetl.getMatnr());
                        ManPakOut manPakOut = manPakOutService.selectOne(manPakOutEntityWrapper);
                        if (manPakOut.getCount() + wrkDetl.getAnfme() >= manPakOut.getAnfme()){
                            manPakOut.setStatus(1);
                        }
                        manPakOut.setCount(manPakOut.getCount() + wrkDetl.getAnfme());
                        if (!manPakOutService.update(manPakOut,manPakOutEntityWrapper)){
                            return FAIL.setMsg("更新拣货单完成数量失败");
                        if (!Cools.isEmpty(manPakOut)){
                            if (manPakOut.getCount() + wrkDetl.getAnfme() >= manPakOut.getAnfme()){
                                manPakOut.setStatus(1);
                            }
                            manPakOut.setCount(manPakOut.getCount() + wrkDetl.getAnfme());
                            if (!manPakOutService.update(manPakOut,manPakOutEntityWrapper)){
                                return FAIL.setMsg("更新拣货单完成数量失败");
                            }
                        }

                    }

 src/main/java/com/zy/asrs/task/kingdee/LoginAuthenticationScheduler.java

@@ -4,6 +4,7 @@
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;

@Slf4j
@@ -15,7 +16,7 @@
    @Value("${erp.switch.LoginAuthenticationSwitch}")
    private boolean LoginAuthenticationSwitch;

    //@Scheduled(cron = "0/3 * * * * ? ")
//    @Scheduled(cron = "0/3 * * * * ? ")
    void login(){
        if(!LoginAuthenticationSwitch){
            return;

 src/main/resources/application.yml

@@ -75,7 +75,7 @@
    PushDowmOrderSwitch: true
  #  地址
  address:
    URL: http://lubemater.ik3cloud.com/k3cloud/html5/
    URL: http://lubemater.ik3cloud.com/
    #登录地址
    loginaddress: K3CLOUD/Kingdee.BOS.WebApi.ServicesStub.AuthService.ValidateUser.common.kdsvc
    #单据，商品档案地址
@@ -95,4 +95,4 @@
    password: "a.222222"
    lcid: 2052
#  保持true
  enable: false
  enable: true

 src/main/resources/mapper/LocDetlMapper.xml

@@ -652,14 +652,14 @@
        and b.loc_sts = 'F'
        and a.matnr = #{matnr}

        <!--        <choose>-->
        <!--            <when test="batch != null and batch != ''">-->
        <!--                and a.batch = #{batch}-->
        <!--            </when>-->
        <!--            <otherwise>-->
        <!--                and (a.batch IS NULL OR a.batch = '')-->
        <!--            </otherwise>-->
        <!--        </choose>-->
        <choose>
            <when test="batch != null and batch != ''">
                and a.batch = #{batch}
            </when>
            <otherwise>
                and (a.batch IS NULL OR a.batch = '')
            </otherwise>
        </choose>

        <choose>
            <when test="owner != null and owner !=0">