|
|
@@ -655,6 +655,14 @@ public class MESServiceImpl implements MESService {
|
|
|
String tlpiclass = "生产退料单", tlcaller = "ProdInOut!Make!Return", bcpiclass = "拨出单", bccaller = "ProdInOut!AppropriationOut";
|
|
|
List<String> sqls = new ArrayList<>();
|
|
|
int frob=99;
|
|
|
+ JSONArray array = data.get("detail");
|
|
|
+ if(array!=null&&array.size()>0){
|
|
|
+ String macode = StringUtil.valueOf(JSON.parseObject(StringUtil.nvl(array.get(0), "{}")).get("FICMOBillNo"));
|
|
|
+ ma_tasktype = StringUtil.nvl(baseDao.getFieldDataByCondition("Make", "ma_tasktype",
|
|
|
+ "ma_code in ('" + macode + "')"),"");
|
|
|
+ maid = Integer.parseInt(StringUtil.nvl(baseDao.getFieldDataByCondition("Make", "ma_id",
|
|
|
+ "ma_code in ('" + macode + "')"),"0"));
|
|
|
+ }
|
|
|
for (int i = 0; i <jsonArray.size() ; i++) {
|
|
|
Object obj = jsonArray.get(i);
|
|
|
JSONObject jsonObject2 = JSON.parseObject(StringUtil.nvl(obj, ""));
|
|
|
@@ -664,11 +672,6 @@ public class MESServiceImpl implements MESService {
|
|
|
Map<Object, Object> map4 = JSONUtil.toMap(StringUtil.nvl(jsonObject2.get("FSManagerID"),"{}"));
|
|
|
Map<Object, Object> map5 = JSONUtil.toMap(StringUtil.nvl(jsonObject2.get("FBillerID"),"{}"));
|
|
|
frob = Integer.parseInt(StringUtil.nvl(jsonObject2.get("FROB"), "99"));
|
|
|
- String macode = StringUtil.valueOf(jsonObject2.get("FICMOBillNo"));
|
|
|
- ma_tasktype = StringUtil.nvl(baseDao.getFieldDataByCondition("Make", "ma_tasktype",
|
|
|
- "ma_code in ('" + macode + "')"),"");
|
|
|
- maid = Integer.parseInt(StringUtil.nvl(baseDao.getFieldDataByCondition("Make", "ma_id",
|
|
|
- "ma_code in ('" + macode + "')"),"0"));
|
|
|
if ("OS".equals(ma_tasktype)) {
|
|
|
tlpiclass = "委外退料单";
|
|
|
tlcaller = "ProdInOut!OutsideReturn";
|
|
|
@@ -690,7 +693,6 @@ public class MESServiceImpl implements MESService {
|
|
|
}
|
|
|
Object[] warehouses=null;
|
|
|
Object[] warehouses2=null;
|
|
|
- JSONArray array = data.get("detail");
|
|
|
int detno=1;
|
|
|
int det=1;
|
|
|
for (int i = 0; i <array.size(); i++) {
|
