App读卡问题解决

YYC

2023-07-11 9d1eb684e0b0a3f6a9107db3cc64fc782989a654

App读卡问题解决

 igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/HPhoneServiceImpl.java

@@ -163,7 +163,7 @@
            hql += " and intelCard =:intelCard";
            args.put("intelCard", intelCard);
        }
        hql += " order by registerTime";
        hql += " order by registerTime desc";

        List<InoutRecord> list = this.query(hql, args);
        if (null == list || list.isEmpty()) {

 igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5201.java

@@ -16,6 +16,7 @@
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.util.Date;

/**
@@ -54,6 +55,7 @@
        //调用入库下一流程
        InoutData data = new InoutData();
        data.setUserName(param.getUserName());
        data.setIntelCard(param.getIntelCard());
        data.setUserId(param.getUserId());
        data.setUserContact(param.getUserContact());
        data.setPlateNum(param.getPlateNum());

 igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5202.java

@@ -55,6 +55,7 @@
        //调用出库下一流程
        InoutData data = new InoutData();
        data.setUserName(param.getUserName());
        data.setIntelCard(param.getIntelCard());
        data.setUserId(param.getUserId());
        data.setUserContact(param.getUserContact());
        data.setPlateNum(param.getPlateNum());

 igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5205.java

@@ -79,7 +79,7 @@
        if (listProgress != null && !listProgress.isEmpty()) {
            for (InoutData inoutData : listProgress) {
                phone35InoutDto = new Phone35InoutDto();
                BeanUtils.copyProperties(inoutData, inoutData);
                BeanUtils.copyProperties(inoutData, phone35InoutDto);


                if (InoutConstant.TYPE_IN.equals(inoutData.getType())) {

 igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager.java

@@ -367,8 +367,9 @@
        if (null != msg) {
            return new PageResponse<>(RespCodeEnum.CODE_1111.getCode(), msg);
        }


        data.setCompleteTime(param.getCompleteTime());
        data.setProgress(InoutConstant.PROGRESS_RECORD);
        inoutService.updateInoutCache(data);
        // 流程完成收事件
        inoutEventControl.onInoutComplete(data);

@@ -862,6 +863,7 @@
        curData.setRemarks(data.getRemarks());
        curData.setCheckItems(data.getCheckItems());
        curData.setCheckTime(data.getCheckTime());
        curData.setDepotId(data.getDepotId());

        if (StringUtils.isEmpty(data.getCheckUser())) {
            curData.setCheckUser(ContextUtil.getLoginUserCName());

 igds-inout/src/main/java/com/ld/igds/inout/service/impl/InoutServiceImpl.java

@@ -292,7 +292,7 @@
        }

        // 清除缓存
        this.delFromCache(param.getDeptId(), param.getType(), param.getId());
//        this.delFromCache(param.getDeptId(), param.getType(), param.getId());


        inoutMapper.toComplete(param);

 igds-inout/src/main/resources/mapper/InoutCheckMapper.xml

@@ -79,6 +79,7 @@
        CHECK_ID_ as checkId,
        CHECK_STATUS_ AS checkStatus,
        REMARKS_ AS remarks,
        FOOD_YEAR_ AS foodYear,
        IF(ISNULL(SAMPLE_TIME_),'NONE','SAMPLE') AS sampleStatus
        from
        D_INOUT_RECORD

 igds-web/src/main/resources/templates/admin/inout/out-card-back.html

@@ -325,12 +325,6 @@
                                </div>
                            </div>

                            <div class="rkbk-quick layui-text-center">
                                <button class="rkbk-quick-btn layui-btn btn-green" type='button'
                                        onclick="submit()">
                                    <i><img th:src="@{../../static/images/icon-ok.png}"/></i> 出库收卡
                                </button>
                            </div>
                        </form>
                    </div>
                </div>