Merge remote-tracking branch 'origin/master'

src/main/java/com/gaotao/modules/purchasingManagement/service/Impl/MaterialSplitServiceImpl.java

@@ -87,6 +87,13 @@ public class MaterialSplitServiceImpl implements MaterialSplitService {
             inList.get(0).setCreatedDate(new Date());
             materialSplitMapper.saveCOrderSlittedList(inList.get(0));
         }
+        //调用查询
+        QueryWrapper<TblBaseDataEntity> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("site", "ALL");
+        queryWrapper.eq("type", "material_origin");
+        TblBaseDataEntity materialData = baseDataDao.selectOne(queryWrapper);
+        //设置制造地
+        String materialOrigin = materialData.getBaseData();
         //新增明细表数据
         for (int i = 0; i <inList.size(); i++) {
             inList.get(i).setCreatedDate(new Date());
@@ -103,6 +110,7 @@ public class MaterialSplitServiceImpl implements MaterialSplitService {
                 materialSplitMapper.saveCRollInfo(inList.get(i));
                 //查询出打印的数据
                 Map<String, Object> printMap = materialSplitMapper.getSplitPrintMaterialRoll(inList.get(i));
+                printMap.put("materialOrigin", materialOrigin);
                 //添加打印的数据
                 printList.add(printMap);
             }