|
@@ -462,7 +462,11 @@ public class FbsWorkingStatisticsController {
|
|
|
|
|
|
if(entity.getState().equals("1")){
|
|
|
//把数据传入u8数据库
|
|
|
- saveU8(entity,workshopDispatchList,allHors);
|
|
|
+ Map<String,Object> map=saveU8(entity,workshopDispatchList,allHors);
|
|
|
+ Object objects=map.get("result");
|
|
|
+ res.setCode("0");
|
|
|
+ res.setMsg(objects.toString());
|
|
|
+ return new ResponseEntity<ResHttpStatus>(res, HttpStatus.OK);
|
|
|
}
|
|
|
|
|
|
res.setCode("0");
|
|
@@ -472,14 +476,15 @@ public class FbsWorkingStatisticsController {
|
|
|
}
|
|
|
|
|
|
//入库接口
|
|
|
- public void saveU8(FbsWorkingStatistics entity,FbsWorkshopDispatchList workshopDispatchList,BigDecimal allHors){
|
|
|
+ public Map<String, Object> saveU8(FbsWorkingStatistics entity,FbsWorkshopDispatchList workshopDispatchList,BigDecimal allHors){
|
|
|
+ Map<String, Object> mapR=new LinkedHashMap<>();
|
|
|
if(StringUtils.isNotBlank(entity.getBatchCode())){
|
|
|
String[] batchCodes=entity.getBatchCode().split(",");//解析逗号分隔的批号
|
|
|
List<Map<String,Object>> mapList=new ArrayList<>();
|
|
|
for(String batchCode:batchCodes){
|
|
|
//明细
|
|
|
Map<String,Object> itemMap=new LinkedHashMap<>();
|
|
|
- itemMap.put("CINVCODE",entity.getMaterielCode());//成品存货编码
|
|
|
+ itemMap.put("CINVCODE",workshopDispatchList.getProductId());//成品存货编码
|
|
|
itemMap.put("IQUANTITY",entity.getQualifiedNumber());//数量
|
|
|
itemMap.put("MOCODE",workshopDispatchList.getProductionOrderNumberName());//订单号
|
|
|
itemMap.put("MOROWMO",entity.getRowNumber());//行号
|
|
@@ -494,7 +499,12 @@ public class FbsWorkingStatisticsController {
|
|
|
}
|
|
|
//表头
|
|
|
Map<String,Object> map=new LinkedHashMap<>();
|
|
|
- map.put("CVOUCHCODE",UUID.randomUUID());//单号
|
|
|
+ map.put("CSTORENAME","100");//账套号
|
|
|
+ Random random = new Random();
|
|
|
+ int nextInt = random.nextInt(9000000);
|
|
|
+ nextInt=nextInt+1000000;
|
|
|
+ String str=nextInt+"";
|
|
|
+ map.put("CVOUCHCODE",str);//单号UUID.randomUUID()
|
|
|
Date date=new Date();
|
|
|
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
|
|
|
map.put("DDATE",sdf.format(date));//入库日期
|
|
@@ -504,9 +514,9 @@ public class FbsWorkingStatisticsController {
|
|
|
map.put("CRDCODE","103");//入库类型编码
|
|
|
map.put("DETAILList",mapList);
|
|
|
//调用WebService接口
|
|
|
- getWebService(map);
|
|
|
+ mapR=getWebService(map);
|
|
|
}
|
|
|
-
|
|
|
+ return mapR;
|
|
|
}
|
|
|
|
|
|
//调用WebService接口
|
|
@@ -515,9 +525,11 @@ public class FbsWorkingStatisticsController {
|
|
|
// args = new String[]{""};
|
|
|
// }
|
|
|
String jsonObject = JSONUtils.toJSONString(mapR);
|
|
|
+ System.out.println(jsonObject);
|
|
|
// 创建动态客户端
|
|
|
JaxWsDynamicClientFactory dcf = JaxWsDynamicClientFactory.newInstance();
|
|
|
- Client client = dcf.createClient("http://10.1.191.191:8090/WebService.asmx");
|
|
|
+// Client client = dcf.createClient("http://10.1.191.191:8090/WebService.asmx");
|
|
|
+ Client client = dcf.createClient("http://47.103.119.148:8090/WebService.asmx?WSDL");
|
|
|
// 需要密码的情况需要加上用户名和密码
|
|
|
// client.getOutInterceptors().add(new ClientLoginInterceptor(USER_NAME,PASS_WORD));
|
|
|
// 命名空间,方法名
|
|
@@ -527,6 +539,8 @@ public class FbsWorkingStatisticsController {
|
|
|
// invoke("方法名",参数1,参数2,参数3....);
|
|
|
Object[] objects = client.invoke(name, jsonObject);
|
|
|
map.put("result", objects);
|
|
|
+ System.out.println(map.get("result"));
|
|
|
+ System.out.println(Arrays.toString(objects));
|
|
|
return map;
|
|
|
} catch (java.lang.Exception e) {
|
|
|
e.printStackTrace();
|
|
@@ -923,6 +937,7 @@ public class FbsWorkingStatisticsController {
|
|
|
*/
|
|
|
@GetMapping(value = "/getByMaterial")
|
|
|
public Result<Map<String,Object>> getByMaterial(String type){
|
|
|
+// getWebService(ceshi());
|
|
|
Result<Map<String,Object>> result=new Result<>();
|
|
|
try {
|
|
|
String dateString="%Y-%m";//月
|
|
@@ -940,6 +955,48 @@ public class FbsWorkingStatisticsController {
|
|
|
}
|
|
|
|
|
|
|
|
|
+ public Map<String,Object> ceshi(){
|
|
|
+ List<Map<String,Object>> mapList=new ArrayList<>();
|
|
|
+ //明细
|
|
|
+ Map<String,Object> itemMap=new LinkedHashMap<>();
|
|
|
+ itemMap.put("CINVCODE","660001155");//成品存货编码
|
|
|
+ itemMap.put("IQUANTITY","1");//数量
|
|
|
+ itemMap.put("MOCODE","WO20090015");//订单号
|
|
|
+ itemMap.put("MOROWMO","1");//行号
|
|
|
+ itemMap.put("CBATCH","1");//批号
|
|
|
+// itemMap.put("cDefine27",allHors.doubleValue());//实际工时
|
|
|
+// Double number=Double.valueOf(entity.getQualifiedNumber());//数量
|
|
|
+// Double working=Double.valueOf(workshopDispatchList.getStandardWorkingHoursZ());//U8标准工时
|
|
|
+// DecimalFormat df = new DecimalFormat("#.00");
|
|
|
+// String workingTatol=df.format(number*working);
|
|
|
+// itemMap.put("cDefine26",workingTatol);//实际总工时
|
|
|
+ mapList.add(itemMap);
|
|
|
+ //表头
|
|
|
+ Map<String,Object> map=new LinkedHashMap<>();
|
|
|
+ map.put("CSTORENAME","100");//账套号
|
|
|
+// UUID uuid=UUID.randomUUID();
|
|
|
+// String uuidStr=uuid.toString().replace("-","");
|
|
|
+ Random random = new Random();
|
|
|
+ int nextInt = random.nextInt(9000000);
|
|
|
+ nextInt=nextInt+1000000;
|
|
|
+ String str=nextInt+"";
|
|
|
+ map.put("CVOUCHCODE",str);//单号
|
|
|
+ Date date=new Date();
|
|
|
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
|
|
|
+ map.put("DDATE",sdf.format(date));//入库日期
|
|
|
+ map.put("CWHCODE","01");//仓库编码
|
|
|
+ map.put("CDEPCODE","07");//部门编码
|
|
|
+ map.put("CMAKER","AA");//制单人
|
|
|
+ map.put("CRDCODE","103");//入库类型编码
|
|
|
+ map.put("DETAILList",mapList);
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+ getWebService(map);
|
|
|
+ return map;
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
public static void main(String[] args) {
|
|
|
/*Map<String, String> map = new TreeMap<String, String>();
|
|
|
map.put("d", "44");
|