Merge remote-tracking branch 'origin/devlop-phyz' into devlop-phyz

1

3 天以前 dc434264996b83c7900be642dd6af604bd98b13d

 rsf-server/src/main/java/com/vincent/rsf/server/system/utils/SerialRuleUtils.java

@@ -5,6 +5,7 @@
import com.vincent.rsf.framework.common.SpringUtils;
import com.vincent.rsf.framework.exception.CoolException;
import com.vincent.rsf.server.common.utils.DateUtils;
import com.vincent.rsf.server.system.constant.SerialRuleCode;
import com.vincent.rsf.server.system.entity.SerialRule;
import com.vincent.rsf.server.system.entity.SerialRuleItem;
import com.vincent.rsf.server.system.enums.SerialRuleReset;
@@ -55,6 +56,12 @@
            throw new CoolException("编码规则明细为空！！");
        }

        //银座特供
        if (code.equals(SerialRuleCode.SYS_ASN_ORDER)){
            StringBuffer buffer = new StringBuffer();
            Object poCode = objectToMap(obj).get("poCode");
            return poCode == null ? "" : buffer.append(poCode).toString();
        }
        StringBuffer buffer = new StringBuffer();
        ruleItems.forEach(rule -> {
            if (rule.getWkType().equals(SerialRuleType.WK_CONSTANT.wkType)) {
@@ -64,9 +71,9 @@
                if (serialRule.getReset().equals(SerialRuleReset.SERIAL_REST_TYPE_YEAR.type)) {
                     format = DateUtils.format(new Date(), "yyyy");
                } else if (serialRule.getReset().equals(SerialRuleReset.SERIAL_REST_TYPE_MONTH.type)) {
                     format = DateUtils.format(new Date(), "yyyyMM");
                     format = DateUtils.format(new Date(), "yyMM");
                } else if (serialRule.getReset().equals(SerialRuleReset.SERIAL_REST_TYPE_DAYS.type)){
                     format = DateUtils.format(new Date(), "yyyyMMdd");
                     format = DateUtils.format(new Date(), "yyMMdd");
                }
                //当前值自动加1
                Integer curVal = serialRule.getCurrValue() + 1;