소스 검색

1、修改生成票据
2、修改新建公司时系统参数

zhoux 1 년 전
부모
커밋
091b53d9fa
2개의 변경된 파일4개의 추가작업 그리고 1개의 파일을 삭제
  1. 3 0
      src/main/java/com/dk/mdm/mapper/mst/PrintLayoutMapper.xml
  2. 1 1
      src/main/java/com/dk/mdm/service/mst/StaffService.java

+ 3 - 0
src/main/java/com/dk/mdm/mapper/mst/PrintLayoutMapper.xml

@@ -48,6 +48,9 @@
             <if test="remarks != null and remarks != ''">
             <if test="remarks != null and remarks != ''">
                 AND remarks = #{remarks}
                 AND remarks = #{remarks}
             </if>
             </if>
+            <if test="cpId != null">
+                AND cp_id = #{cpId}
+            </if>
             <if test="flgValidList != null and flgValidList.size()>0">
             <if test="flgValidList != null and flgValidList.size()>0">
                 AND flg_valid = any(#{flgValidList, typeHandler=BooleanListTypeHandler})
                 AND flg_valid = any(#{flgValidList, typeHandler=BooleanListTypeHandler})
             </if>
             </if>

+ 1 - 1
src/main/java/com/dk/mdm/service/mst/StaffService.java

@@ -361,7 +361,7 @@ public class StaffService extends BaseService<Staff> {
             List<SettingValue> settingValueList = new ArrayList<>();
             List<SettingValue> settingValueList = new ArrayList<>();
             // 自动办理
             // 自动办理
             settingValueList.add(new SettingValue().setCpId(cpId).setSettingCode(Constant.SystemConstant.IVT_001.getValue())
             settingValueList.add(new SettingValue().setCpId(cpId).setSettingCode(Constant.SystemConstant.IVT_001.getValue())
-                    .setSettingValue("false"));
+                    .setSettingValue("true"));
             // 欠货销售
             // 欠货销售
             settingValueList.add(new SettingValue().setCpId(cpId).setSettingCode(Constant.SystemConstant.IVT_002.getValue())
             settingValueList.add(new SettingValue().setCpId(cpId).setSettingCode(Constant.SystemConstant.IVT_002.getValue())
                     .setSettingValue("false"));
                     .setSettingValue("false"));