wms / wms_wuhangelinmei · Commits

Commit 7b3aecabe3b9d61844865d8af9c9e48aa22ee39c

Authored by 易文鹏
2 parents 7f71eb81 fc8fee08

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

Inline Side-by-side
Showing 1 changed file with 6 additions and 6 deletions
src/main/java/com/huaheng/api/general/service/BasicDataApiService.java
  View file @7b3aeca
... ... @@ -223,16 +223,16 @@ public class BasicDataApiService {
223 223 // return AjaxResult.error("没有该货主!!");
224 224 // }
225 225 String code=material.getCode();
226   - if(code.startsWith("290") && code.startsWith("288")&& code.startsWith("11601")&& code.startsWith("29302136C")&& code.startsWith("29302136M")&& code.startsWith("196")){
  226 + if(code.startsWith("293") || code.startsWith("290") || code.startsWith("288")|| code.startsWith("11601")|| code.startsWith("29302136C")|| code.startsWith("29302136M")|| code.startsWith("196")){
227 227 material.setIsBattery(1);
228 228 }else{
229 229 material.setIsBattery(2);
230 230 }
231   - if(code.startsWith("290") && code.startsWith("288")&& code.startsWith("29302136C")&& code.startsWith("29302136M")){
232   - material.setIsBatteryProduct("1");
233   - }else{
234   - material.setIsBatteryProduct("0");
235   - }
  231 +// if(code.startsWith("293") || code.startsWith("290") || code.startsWith("288")|| code.startsWith("29302136C") || code.startsWith("29302136M")){
  232 +// material.setIsBatteryProduct("1");
  233 +// }else{
  234 +// material.setIsBatteryProduct("0");
  235 +// }
236 236 Boolean flag = false;
237 237 try {
238 238 //3、查看此物料在系统是否存在
... ...