最新版本541200007

jiangping

2025-06-10 c0f8a98d336602143bf64d7a98828461658b3956

最新版本541200007

 screen/vite.config.js

@@ -26,8 +26,8 @@
    proxy: {
      "/gateway_interface": {
        // target: "http://192.168.0.104:10010",
        target: "http://10.50.250.253:8088/gateway_interface",
        // target: "https://atwl.ahzyssl.com/zhyq_interface",
        // target: "http://10.50.250.253:8088/gateway_interface",
        target: "https://atwl.ahzyssl.com/zhyq_interface",
        changeOrigin: true,
        rewrite: (path) => path.replace(/^\/gateway_interface/, ""),
      },

 server/visits/dmvisit_service/src/main/java/com/doumee/core/wms/model/request/WmsInboundDetailRequest.java

@@ -22,5 +22,5 @@
    @ApiModelProperty(value = "计划收货数量" ,example = "1")
    private BigDecimal ioQty;
    @ApiModelProperty(value = "物料转换率" ,example = "1")
    private String rate;
    private BigDecimal rate;
}

 server/visits/dmvisit_service/src/main/java/com/doumee/core/wms/model/request/WmsOutboundDetailRequest.java

@@ -20,6 +20,6 @@
    @ApiModelProperty(value = "计划收货数量" ,example = "1")
    private BigDecimal ioQty;
    @ApiModelProperty(value = "物料转换率" ,example = "1")
    private String rate;
    private BigDecimal rate;

}

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java

@@ -602,6 +602,7 @@
                .set(SystemUser::getUpdateUser,member.getEditor())
                .set(SystemUser::getUpdateTime,member.getEditDate())
        );
//        cancelAllMemberEmpower(member,memberRoleMapper,empowerMapper);
        saveUserActionBiz(member,loginUserInfo,Constants.UserActionType.DELETE,userActionJoinMapper,JSONObject.toJSONString(member));
        List<Cars> carsList = carsMapper.selectList(new QueryWrapper<Cars>().lambda()
                .eq(Cars::getMemberId,member.getId())

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncEmpowerServiceImpl.java

@@ -545,7 +545,8 @@
        List<Empower> faceErrorList = new ArrayList<>();
        for(Empower c : list) {
            //向任务添加人员、设备信息数据
            if((Constants.equalsInteger(c.getMemberDeleted(),Constants.ONE) &&
            if((Constants.equalsInteger(c.getIsdeleted(),Constants.ZERO) &&
                    Constants.equalsInteger(c.getMemberDeleted(),Constants.ONE) &&
                    Constants.equalsInteger(c.getMemberHkStatus(),Constants.ONE))
                    ||  Constants.equalsInteger(c.getDeviceDeleted(),1)){
                //如果人員或者設備删除，取消下发
@@ -553,7 +554,8 @@
                continue;
            }
            if(Constants.equalsInteger(c.getMemberDeleted(),Constants.ONE)
                   && Constants.equalsInteger(c.getIsdeleted(),1)){
                    && Constants.equalsInteger(c.getMemberHkStatus(),Constants.ONE)
                    && Constants.equalsInteger(c.getIsdeleted(),Constants.ZERO)){
                //如果人员已离职，新增授权无需下发，取消下发
                cacenList.add(c);
                continue;
@@ -790,8 +792,8 @@
        queryWrapper.selectAs(Device::getChannelNo,Empower::getDeviceChannelNo);
        queryWrapper.selectAs(Member::getHkId,Empower::getMemberHkId);
        queryWrapper.selectAs(Member::getFaceStatus,Empower::getMemberFaceStatus);
        queryWrapper.selectAs(Member::getHkStatus,Empower::getMemberFaceStatus);
        queryWrapper.selectAs(Device::getOnline,Empower::getMemberHkStatus);
        queryWrapper.selectAs(Member::getHkStatus,Empower::getMemberHkStatus);
        queryWrapper.selectAs(Device::getOnline,Empower::getDeviceOnline);
        queryWrapper.selectAs(Device::getIsdeleted,Empower::getDeviceDeleted);
        queryWrapper.selectAs(Member::getIsdeleted,Empower::getMemberDeleted);
        queryWrapper.selectAs(Device::getHkId,Empower::getDeviceIndexCode);

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/ferp/HkSyncOrgUserToHKServiceImpl.java

@@ -360,7 +360,8 @@
     */
    @Override
    public   void syncMemberDelData(){
        if(Constants.DEALING_HK_DEL_USER  || Constants.formatIntegerNum(dataSyncConfig.getOrgUserDataOrigin()) != DataSyncConfig.origin.erp){
        if(Constants.DEALING_HK_DEL_USER
                || Constants.formatIntegerNum(dataSyncConfig.getOrgUserDataOrigin())== DataSyncConfig.origin.hk){
            return   ;
        }
        Constants.DEALING_HK_DEL_USER =true;
@@ -419,14 +420,16 @@
        }
        Date date = new Date();
        for(Member member : list){
            //一卡通授权下发状态 0待下发 1已下发 2下发成功   3已取消 4下发失败 5任务下载已结束
            if(member!=null && Constants.equalsInteger(member.getIsdeleted(),Constants.ONE) ){
                if(empowerMapper.selectCount(new QueryWrapper<Empower>().lambda()
                        .eq(Empower::getMemberId, member.getId())
                        .eq(Empower::getIsdeleted,Constants.ONE)
                        .ne(Empower::getFailFlag,Constants.ONE)
                        .ne(Empower::getSendStatus,Constants.EmpowerStatus.pass)) ==0) {
                    //如果权限都已经删除成功，则删除海康人员和卡片数据

                        .notIn(Empower::getSendStatus
                                ,Constants.EmpowerStatus.pass
                                ,Constants.EmpowerStatus.cancel )) ==0) {
                    //如果权限都已经删除成功，则删除海康人员和卡片数
                    HkSyncEmpowerServiceImpl.doHkDeleteUser(member.getId(),member.getHkId(),date,memberMapper1,memberCardMapper);
                }
            }
@@ -458,7 +461,6 @@
                                //脏数据不处理
                            }
                        }

                    }
                }
                return  r;
@@ -536,7 +538,6 @@
            //如果没有卡 也没有人脸
            return;
        }

        if(Constants.equalsInteger(member.getIsdeleted(),Constants.ZERO)){
//                && Constants.equalsInteger(member.getHkStatus(),Constants.ONE)){
            List<Integer> deviceIds =new ArrayList<>();//新设备编码集合
@@ -677,7 +678,6 @@
            cr.setCardType(m.getType());
            param.getCardList().add(cr);
        }

        //处理新增数据
        BaseResponse<List<CardInfoResponse>> result =  HKService.cardBingding(param);
        if(result !=null && StringUtils.equals(result.getCode(),HKConstants.RESPONSE_SUCCEE) ){

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/WmsServiceImpl.java

@@ -320,9 +320,9 @@
                        entity.setJobId(job.getJobId());
                        entity.setContractNum(param.getContractNum());
                        entity.setWmsJobId(job.getId());
                        entity.setIoQty(d.getIoQty());
                        entity.setStatus(Constants.ZERO);
                        entity.setRate(d.getRate());
                        entity.setIoQty(Constants.formatBigdecimal(d.getIoQty()).multiply(Constants.formatBigdecimal( d.getRate())));
                        entity.setRate(Constants.formatBigdecimal(d.getRate()).doubleValue()+"");
                        entity.setMaterialName(d.getMaterialName());
                        entity.setInRepertotyCode(d.getInRepertotyCode());
                        iocodeList.add(d.getIoCode());
@@ -554,11 +554,13 @@
                        entity.setJobId(job.getJobId());
                        entity.setWmsJobId(job.getId());
                        entity.setContractNum(param.getContractNum());
                        entity.setIoQty(d.getIoQty());
                        entity.setRepertotyAddress(job.getRepertotyAddress());
                        entity.setWmsJobId(job.getId());
                        entity.setStatus(Constants.ZERO);
                        entity.setRate(d.getRate());
                        entity.setIoQty(Constants.formatBigdecimal(d.getIoQty()).multiply(Constants.formatBigdecimal( d.getRate())));
                        entity.setRate(Constants.formatBigdecimal(d.getRate()).doubleValue()+"");
//                        entity.setIoQty(d.getIoQty());
//                        entity.setRate(d.getRate());
                        entity.setMaterialName(d.getMaterialName());
                        iocodeList.add(d.getIoCode());
                        details.add(entity);