|
@@ -264,8 +264,29 @@ public class InServiceImpl implements InService {
|
264
|
264
|
}
|
265
|
265
|
Stack stack = stackMapper.selectByWareNameStackName(wareName, stackName, userId, belongId);
|
266
|
266
|
if (stack == null) {
|
267
|
|
- err += "未找到名为\"" + stackName + "\"的垛位号;";
|
268
|
|
- throw new Exception(err);
|
|
267
|
+ Stack stack_new = new Stack();
|
|
268
|
+ stack_new.setId(ware.getId().substring(0,10)+stackName);
|
|
269
|
+ stack_new.setWare(ware);
|
|
270
|
+ stack_new.setName(stackName);
|
|
271
|
+ stack_new.setCode(stackName);
|
|
272
|
+ stack_new.setStackX(0);
|
|
273
|
+ stack_new.setStackY(0);
|
|
274
|
+ stack_new.setHeight(0);
|
|
275
|
+ stack_new.setWidth(0);
|
|
276
|
+ stack_new.setIsLayer("1");
|
|
277
|
+ stack_new.setAddId(userId);
|
|
278
|
+ stack_new.setAddTime(new Date());
|
|
279
|
+ stack_new.setModifyId(userId);
|
|
280
|
+ stack_new.setModifyTime(new Date());
|
|
281
|
+ stack_new.setCancelFlag("0");
|
|
282
|
+ stack_new.setBelongId(belongId);
|
|
283
|
+ num = stackMapper.insert(stack_new);
|
|
284
|
+ if (num > 0) {
|
|
285
|
+ stack = stackMapper.selectByWareNameStackName(wareName, stackName, userId, belongId);
|
|
286
|
+ }else{
|
|
287
|
+ err += "新增\"" + stackName + "\"垛位出错;";
|
|
288
|
+ throw new Exception(err);
|
|
289
|
+ }
|
269
|
290
|
}
|
270
|
291
|
Material material = materialMapper.selectByNameStandard(materialName, standard, belongId);
|
271
|
292
|
if (material == null) {
|
|
@@ -301,8 +322,29 @@ public class InServiceImpl implements InService {
|
301
|
322
|
stackName = listJO.get(i).get("垛位").toString();
|
302
|
323
|
stack = stackMapper.selectByWareNameStackName(wareName, stackName, userId, belongId);
|
303
|
324
|
if (stack == null) {
|
304
|
|
- err += "未找到名为\"" + stackName + "\"的垛位;";
|
305
|
|
- throw new Exception(err);
|
|
325
|
+ Stack stack_new = new Stack();
|
|
326
|
+ stack_new.setId(ware.getId().substring(0,10)+stackName);
|
|
327
|
+ stack_new.setWare(ware);
|
|
328
|
+ stack_new.setName(stackName);
|
|
329
|
+ stack_new.setCode(stackName);
|
|
330
|
+ stack_new.setStackX(0);
|
|
331
|
+ stack_new.setStackY(0);
|
|
332
|
+ stack_new.setHeight(0);
|
|
333
|
+ stack_new.setWidth(0);
|
|
334
|
+ stack_new.setIsLayer("1");
|
|
335
|
+ stack_new.setAddId(userId);
|
|
336
|
+ stack_new.setAddTime(new Date());
|
|
337
|
+ stack_new.setModifyId(userId);
|
|
338
|
+ stack_new.setModifyTime(new Date());
|
|
339
|
+ stack_new.setCancelFlag("0");
|
|
340
|
+ stack_new.setBelongId(belongId);
|
|
341
|
+ num = stackMapper.insert(stack_new);
|
|
342
|
+ if (num > 0) {
|
|
343
|
+ stack = stackMapper.selectByWareNameStackName(wareName, stackName, userId, belongId);
|
|
344
|
+ }else{
|
|
345
|
+ err += "新增\"" + stackName + "\"垛位出错;";
|
|
346
|
+ throw new Exception(err);
|
|
347
|
+ }
|
306
|
348
|
}
|
307
|
349
|
store.setStack(stack);
|
308
|
350
|
}
|
|
@@ -340,7 +382,7 @@ public class InServiceImpl implements InService {
|
340
|
382
|
}
|
341
|
383
|
store.setFkComponyId(fk_compony.getId());
|
342
|
384
|
}
|
343
|
|
- //store.setLayer(Integer.parseInt(listJO.get(i).get("层号").toString()));
|
|
385
|
+ store.setLayer(1);
|
344
|
386
|
store.setPlateNo(listJO.get(i).get("产品编号").toString());
|
345
|
387
|
store.setModel(listJO.get(i).get("规格").toString());
|
346
|
388
|
store.setCount(Double.parseDouble(listJO.get(i).get("数量").toString()));
|