|
|
@@ -555,6 +555,7 @@ public class GenerateBarcodeServiceImpl implements GenerateBarcodeService{ //生
|
|
|
mp.put("BAR_REMAIN", total_remain);
|
|
|
mp.put("BAR_BATCHQTY", total_remain);
|
|
|
mp.put("BAR_STATUS", "1");
|
|
|
+ mp.remove("BAR_PLACE");
|
|
|
// 合并成一条barcode
|
|
|
baseDao.execute(SqlUtil.getInsertSqlByMap(mp, "barcode"));
|
|
|
int bc_id;
|
|
|
@@ -690,6 +691,7 @@ public class GenerateBarcodeServiceImpl implements GenerateBarcodeService{ //生
|
|
|
mp1.put("BAR_REMAIN", bar_remain);
|
|
|
mp1.put("BAR_STATUS", "1");
|
|
|
mp1.put("BAR_RECORDDATE", DateUtil.format(null, "yyyy-MM-dd HH:mm:ss"));
|
|
|
+ mp1.remove("BAR_PLACE");
|
|
|
baseDao.execute(SqlUtil.getInsertSqlByFormStore(mp1, "barcode", new String[] {}, new Object[] {}));
|
|
|
// 产生barcodechange记录
|
|
|
baseDao.execute("insert into barcodeChange(bc_id,bc_prodcode,bc_kind,bc_indate,bc_inman,bc_reason,bc_qty,bc_barcode,bc_barid,bc_newbarcode,bc_newbarid,bc_newqty) "
|